diff --git a/.github/helper/documentation.py b/.github/helper/documentation.py
new file mode 100644
index 0000000..b603ed5
--- /dev/null
+++ b/.github/helper/documentation.py
@@ -0,0 +1,48 @@
+import sys
+import requests
+from urllib.parse import urlparse
+
+
+docs_repos = [
+	"frappe_docs",
+	"erpnext_documentation",
+	"erpnext_com",
+	"frappe_io",
+]
+
+
+def uri_validator(x):
+	result = urlparse(x)
+	return all([result.scheme, result.netloc, result.path])
+
+def docs_link_exists(body):
+	for line in body.splitlines():
+		for word in line.split():
+			if word.startswith('http') and uri_validator(word):
+				parsed_url = urlparse(word)
+				if parsed_url.netloc == "github.com":
+					_, org, repo, _type, ref = parsed_url.path.split('/')
+					if org == "frappe" and repo in docs_repos:
+						return True
+
+
+if __name__ == "__main__":
+	pr = sys.argv[1]
+	response = requests.get("https://api.github.com/repos/frappe/erpnext/pulls/{}".format(pr))
+
+	if response.ok:
+		payload = response.json()
+		title = payload.get("title", "").lower()
+		head_sha = payload.get("head", {}).get("sha")
+		body = payload.get("body", "").lower()
+
+		if title.startswith("feat") and head_sha and "no-docs" not in body:
+			if docs_link_exists(body):
+				print("Documentation Link Found. You're Awesome! 🎉")
+
+			else:
+				print("Documentation Link Not Found! ⚠️")
+				sys.exit(1)
+
+		else:
+			print("Skipping documentation checks... 🏃")
diff --git a/.github/helper/translation.py b/.github/helper/translation.py
new file mode 100644
index 0000000..340f4f8
--- /dev/null
+++ b/.github/helper/translation.py
@@ -0,0 +1,60 @@
+import re
+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*(.)*?\s*(,\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[\"']")
+starts_with_f_pattern = re.compile(r"_\(f")
+
+# skip first argument
+files = sys.argv[1:]
+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}')
+		file_lines = f.readlines()
+		for line_number, line in enumerate(file_lines, 1):
+			if 'frappe-lint: disable-translate' in line:
+				continue
+
+			start_matches = start_pattern.search(line)
+			if start_matches:
+				starts_with_f = starts_with_f_pattern.search(line)
+
+				if starts_with_f:
+					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 + 1}\n{line.strip()[:100]}')
+						continue
+					else:
+						continue
+
+				match = pattern.search(line)
+				error_found = False
+
+				if not match and line.endswith(',\n'):
+					# concat remaining text to validate multiline pattern
+					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 + 1}\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 + 1}\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.')
+	sys.exit(1)
+else:
+	print('\nGood To Go!')
diff --git a/.github/workflows/docs-checker.yml b/.github/workflows/docs-checker.yml
new file mode 100644
index 0000000..cdf676d
--- /dev/null
+++ b/.github/workflows/docs-checker.yml
@@ -0,0 +1,24 @@
+name: 'Documentation Required'
+on:
+  pull_request:
+    types: [ opened, synchronize, reopened, edited ]
+
+jobs:
+  build:
+    runs-on: ubuntu-latest
+
+    steps:
+      - name: 'Setup Environment'
+        uses: actions/setup-python@v2
+        with:
+          python-version: 3.6
+
+      - name: 'Clone repo'
+        uses: actions/checkout@v2
+
+      - name: Validate Docs
+        env:
+          PR_NUMBER: ${{ github.event.number }}
+        run: |
+          pip install requests --quiet
+          python $GITHUB_WORKSPACE/.github/helper/documentation.py $PR_NUMBER
diff --git a/.github/workflows/translation_linter.yml b/.github/workflows/translation_linter.yml
new file mode 100644
index 0000000..4becaeb
--- /dev/null
+++ b/.github/workflows/translation_linter.yml
@@ -0,0 +1,22 @@
+name: Frappe Linter
+on:
+  pull_request:
+    branches:
+      - develop
+      - version-12-hotfix
+      - version-11-hotfix
+jobs:
+  check_translation:
+    name: Translation Syntax Check
+    runs-on: ubuntu-18.04
+    steps:
+    - uses: actions/checkout@v2
+    - name: Setup python3
+      uses: actions/setup-python@v1
+      with:
+        python-version: 3.6
+    - name: Validating Translation Syntax
+      run: |
+        git fetch origin $GITHUB_BASE_REF:$GITHUB_BASE_REF -q
+        files=$(git diff --name-only --diff-filter=d $GITHUB_BASE_REF)
+        python $GITHUB_WORKSPACE/.github/helper/translation.py $files
diff --git a/erpnext/accounts/custom/address.json b/erpnext/accounts/custom/address.json
index 08f972d..5c921da 100644
--- a/erpnext/accounts/custom/address.json
+++ b/erpnext/accounts/custom/address.json
@@ -1,58 +1,126 @@
 {
  "custom_fields": [
   {
-   "_assign": null, 
-   "_comments": null, 
-   "_liked_by": null, 
-   "_user_tags": null, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "collapsible_depends_on": null, 
-   "columns": 0, 
-   "creation": "2018-12-28 22:29:21.828090", 
-   "default": null, 
-   "depends_on": null, 
-   "description": null, 
-   "docstatus": 0, 
-   "dt": "Address", 
-   "fetch_from": null, 
-   "fieldname": "tax_category", 
-   "fieldtype": "Link", 
-   "hidden": 0, 
-   "idx": 14, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_global_search": 0, 
-   "in_list_view": 0, 
-   "in_standard_filter": 0, 
-   "insert_after": "fax", 
-   "label": "Tax Category", 
-   "modified": "2018-12-28 22:29:21.828090", 
-   "modified_by": "Administrator", 
-   "name": "Address-tax_category", 
-   "no_copy": 0, 
-   "options": "Tax Category", 
-   "owner": "Administrator", 
-   "parent": null, 
-   "parentfield": null, 
-   "parenttype": null, 
-   "permlevel": 0, 
-   "precision": "", 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "print_width": null, 
-   "read_only": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "translatable": 0, 
-   "unique": 0, 
+   "_assign": null,
+   "_comments": null,
+   "_liked_by": null,
+   "_user_tags": null,
+   "allow_in_quick_entry": 0,
+   "allow_on_submit": 0,
+   "bold": 0,
+   "collapsible": 0,
+   "collapsible_depends_on": null,
+   "columns": 0,
+   "creation": "2018-12-28 22:29:21.828090",
+   "default": null,
+   "depends_on": null,
+   "description": null,
+   "docstatus": 0,
+   "dt": "Address",
+   "fetch_from": null,
+   "fetch_if_empty": 0,
+   "fieldname": "tax_category",
+   "fieldtype": "Link",
+   "hidden": 0,
+   "hide_border": 0,
+   "hide_days": 0,
+   "hide_seconds": 0,
+   "idx": 15,
+   "ignore_user_permissions": 0,
+   "ignore_xss_filter": 0,
+   "in_global_search": 0,
+   "in_list_view": 0,
+   "in_preview": 0,
+   "in_standard_filter": 0,
+   "insert_after": "fax",
+   "label": "Tax Category",
+   "length": 0,
+   "mandatory_depends_on": null,
+   "modified": "2018-12-28 22:29:21.828090",
+   "modified_by": "Administrator",
+   "name": "Address-tax_category",
+   "no_copy": 0,
+   "options": "Tax Category",
+   "owner": "Administrator",
+   "parent": null,
+   "parentfield": null,
+   "parenttype": null,
+   "permlevel": 0,
+   "precision": "",
+   "print_hide": 0,
+   "print_hide_if_no_value": 0,
+   "print_width": null,
+   "read_only": 0,
+   "read_only_depends_on": null,
+   "report_hide": 0,
+   "reqd": 0,
+   "search_index": 0,
+   "translatable": 0,
+   "unique": 0,
+   "width": null
+  },
+  {
+   "_assign": null,
+   "_comments": null,
+   "_liked_by": null,
+   "_user_tags": null,
+   "allow_in_quick_entry": 0,
+   "allow_on_submit": 0,
+   "bold": 0,
+   "collapsible": 0,
+   "collapsible_depends_on": null,
+   "columns": 0,
+   "creation": "2020-10-14 17:41:40.878179",
+   "default": "0",
+   "depends_on": null,
+   "description": null,
+   "docstatus": 0,
+   "dt": "Address",
+   "fetch_from": null,
+   "fetch_if_empty": 0,
+   "fieldname": "is_your_company_address",
+   "fieldtype": "Check",
+   "hidden": 0,
+   "hide_border": 0,
+   "hide_days": 0,
+   "hide_seconds": 0,
+   "idx": 20,
+   "ignore_user_permissions": 0,
+   "ignore_xss_filter": 0,
+   "in_global_search": 0,
+   "in_list_view": 0,
+   "in_preview": 0,
+   "in_standard_filter": 0,
+   "insert_after": "linked_with",
+   "label": "Is Your Company Address",
+   "length": 0,
+   "mandatory_depends_on": null,
+   "modified": "2020-10-14 17:41:40.878179",
+   "modified_by": "Administrator",
+   "name": "Address-is_your_company_address",
+   "no_copy": 0,
+   "options": null,
+   "owner": "Administrator",
+   "parent": null,
+   "parentfield": null,
+   "parenttype": null,
+   "permlevel": 0,
+   "precision": "",
+   "print_hide": 0,
+   "print_hide_if_no_value": 0,
+   "print_width": null,
+   "read_only": 0,
+   "read_only_depends_on": null,
+   "report_hide": 0,
+   "reqd": 0,
+   "search_index": 0,
+   "translatable": 0,
+   "unique": 0,
    "width": null
   }
- ], 
- "custom_perms": [], 
- "doctype": "Address", 
- "property_setters": [], 
+ ],
+ "custom_perms": [],
+ "doctype": "Address",
+ "property_setters": [],
  "sync_on_migrate": 1
 }
\ No newline at end of file
diff --git a/erpnext/accounts/custom/address.py b/erpnext/accounts/custom/address.py
new file mode 100644
index 0000000..5e76403
--- /dev/null
+++ b/erpnext/accounts/custom/address.py
@@ -0,0 +1,42 @@
+import frappe
+from frappe import _
+from frappe.contacts.doctype.address.address import Address
+from frappe.contacts.doctype.address.address import get_address_templates
+
+class ERPNextAddress(Address):
+	def validate(self):
+		self.validate_reference()
+		super(ERPNextAddress, self).validate()
+
+	def link_address(self):
+		"""Link address based on owner"""
+		if self.is_your_company_address:
+			return
+
+		return super(ERPNextAddress, self).link_address()
+
+	def validate_reference(self):
+		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."),
+				title=_("Company Not Linked"))
+
+@frappe.whitelist()
+def get_shipping_address(company, address = None):
+	filters = [
+		["Dynamic Link", "link_doctype", "=", "Company"],
+		["Dynamic Link", "link_name", "=", company],
+		["Address", "is_your_company_address", "=", 1]
+	]
+	fields = ["*"]
+	if address and frappe.db.get_value('Dynamic Link',
+		{'parent': address, 'link_name': company}):
+		filters.append(["Address", "name", "=", address])
+
+	address = frappe.get_all("Address", filters=filters, fields=fields) or {}
+
+	if address:
+		address_as_dict = address[0]
+		name, address_template = get_address_templates(address_as_dict)
+		return address_as_dict.get("name"), frappe.render_template(address_template, address_as_dict)
diff --git a/erpnext/accounts/desk_page/accounting/accounting.json b/erpnext/accounts/desk_page/accounting/accounting.json
index 045d8fb..b0371e7 100644
--- a/erpnext/accounts/desk_page/accounting/accounting.json
+++ b/erpnext/accounts/desk_page/accounting/accounting.json
@@ -108,7 +108,7 @@
  "pin_to_top": 0,
  "shortcuts": [
   {
-   "label": "Chart Of Accounts",
+   "label": "Chart of Accounts",
    "link_to": "Account",
    "type": "DocType"
   },
diff --git a/erpnext/accounts/doctype/account/account_tree.js b/erpnext/accounts/doctype/account/account_tree.js
index 28b090b..7bbc1c9 100644
--- a/erpnext/accounts/doctype/account/account_tree.js
+++ b/erpnext/accounts/doctype/account/account_tree.js
@@ -2,7 +2,7 @@
 
 frappe.treeview_settings["Account"] = {
 	breadcrumb: "Accounts",
-	title: __("Chart Of Accounts"),
+	title: __("Chart of Accounts"),
 	get_tree_root: false,
 	filters: [
 		{
@@ -97,7 +97,7 @@
 		treeview.page.add_inner_button(__("Journal Entry"), function() {
 			frappe.new_doc('Journal Entry', {company: get_company()});
 		}, __('Create'));
-		treeview.page.add_inner_button(__("New Company"), function() {
+		treeview.page.add_inner_button(__("Company"), function() {
 			frappe.new_doc('Company');
 		}, __('Create'));
 
diff --git a/erpnext/accounts/doctype/accounts_settings/accounts_settings.json b/erpnext/accounts/doctype/accounts_settings/accounts_settings.json
index 4d3cbea..41f9ce0 100644
--- a/erpnext/accounts/doctype/accounts_settings/accounts_settings.json
+++ b/erpnext/accounts/doctype/accounts_settings/accounts_settings.json
@@ -40,7 +40,7 @@
  "fields": [
   {
    "default": "1",
-   "description": "If enabled, the system will post accounting entries for inventory automatically.",
+   "description": "If enabled, the system will post accounting entries for inventory automatically",
    "fieldname": "auto_accounting_for_stock",
    "fieldtype": "Check",
    "hidden": 1,
@@ -48,23 +48,23 @@
    "label": "Make Accounting Entry For Every Stock Movement"
   },
   {
-   "description": "Accounting entry frozen up to this date, nobody can do / modify entry except role specified below.",
+   "description": "Accounting entries are frozen up to this date. Nobody can create or modify entries except users with the role specified below",
    "fieldname": "acc_frozen_upto",
    "fieldtype": "Date",
    "in_list_view": 1,
-   "label": "Accounts Frozen Upto"
+   "label": "Accounts Frozen Till Date"
   },
   {
    "description": "Users with this role are allowed to set frozen accounts and create / modify accounting entries against frozen accounts",
    "fieldname": "frozen_accounts_modifier",
    "fieldtype": "Link",
    "in_list_view": 1,
-   "label": "Role Allowed to Set Frozen Accounts & Edit Frozen Entries",
+   "label": "Role Allowed to Set Frozen Accounts and Edit Frozen Entries",
    "options": "Role"
   },
   {
    "default": "Billing Address",
-   "description": "Address used to determine Tax Category in transactions.",
+   "description": "Address used to determine Tax Category in transactions",
    "fieldname": "determine_address_tax_category_from",
    "fieldtype": "Select",
    "label": "Determine Address Tax Category From",
@@ -75,7 +75,7 @@
    "fieldtype": "Column Break"
   },
   {
-   "description": "Role that is allowed to submit transactions that exceed credit limits set.",
+   "description": "This role is allowed to submit transactions that exceed credit limits",
    "fieldname": "credit_controller",
    "fieldtype": "Link",
    "in_list_view": 1,
@@ -127,7 +127,7 @@
    "default": "0",
    "fieldname": "show_inclusive_tax_in_print",
    "fieldtype": "Check",
-   "label": "Show Inclusive Tax In Print"
+   "label": "Show Inclusive Tax in Print"
   },
   {
    "fieldname": "column_break_12",
@@ -165,7 +165,7 @@
   },
   {
    "default": "0",
-   "description": "Only select if you have setup Cash Flow Mapper documents",
+   "description": "Only select this if you have set up the Cash Flow Mapper documents",
    "fieldname": "use_custom_cash_flow",
    "fieldtype": "Check",
    "label": "Use Custom Cash Flow Format"
@@ -177,7 +177,7 @@
    "label": "Automatically Fetch Payment Terms"
   },
   {
-   "description": "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 for $110.",
+   "description": "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 ",
    "fieldname": "over_billing_allowance",
    "fieldtype": "Currency",
    "label": "Over Billing Allowance (%)"
@@ -199,7 +199,7 @@
   },
   {
    "default": "0",
-   "description": "If this is unchecked direct GL Entries will be created to book Deferred Revenue/Expense",
+   "description": "If this is unchecked, direct GL entries will be created to book deferred revenue or expense",
    "fieldname": "book_deferred_entries_via_journal_entry",
    "fieldtype": "Check",
    "label": "Book Deferred Entries Via Journal Entry"
@@ -214,7 +214,7 @@
   },
   {
    "default": "Days",
-   "description": "If \"Months\" is selected then fixed amount will be booked as deferred revenue or expense for each month irrespective of number of days in a month. Will be prorated if deferred revenue or expense is not booked for an entire month.",
+   "description": "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",
    "fieldname": "book_deferred_entries_based_on",
    "fieldtype": "Select",
    "label": "Book Deferred Entries Based On",
@@ -226,7 +226,7 @@
  "index_web_pages_for_search": 1,
  "issingle": 1,
  "links": [],
- "modified": "2020-10-07 14:58:50.325577",
+ "modified": "2020-10-13 11:32:52.268826",
  "modified_by": "Administrator",
  "module": "Accounts",
  "name": "Accounts Settings",
@@ -254,4 +254,4 @@
  "sort_field": "modified",
  "sort_order": "ASC",
  "track_changes": 1
-}
\ No newline at end of file
+}
diff --git a/erpnext/accounts/doctype/cashier_closing/cashier_closing.py b/erpnext/accounts/doctype/cashier_closing/cashier_closing.py
index 6de62ee..7ad1d3a 100644
--- a/erpnext/accounts/doctype/cashier_closing/cashier_closing.py
+++ b/erpnext/accounts/doctype/cashier_closing/cashier_closing.py
@@ -23,13 +23,13 @@
 			where posting_date=%s and posting_time>=%s and posting_time<=%s and owner=%s
 		""", (self.date, self.from_time, self.time, self.user))
 		self.outstanding_amount = flt(values[0][0] if values else 0)
-			
+
 	def make_calculations(self):
 		total = 0.00
 		for i in self.payments:
 			total += flt(i.amount)
 
-		self.net_amount = total + self.outstanding_amount + self.expense - self.custody + self.returns
+		self.net_amount = total + self.outstanding_amount + flt(self.expense) - flt(self.custody) + flt(self.returns)
 
 	def validate_time(self):
 		if self.from_time >= self.time:
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 e1b331b..342f21b 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
@@ -195,7 +195,7 @@
 	reader = csv.reader(f)
 
 	from frappe.utils.xlsxutils import make_xlsx
-	xlsx_file = make_xlsx(reader, "Chart Of Accounts Importer Template")
+	xlsx_file = make_xlsx(reader, "Chart of Accounts Importer Template")
 
 	f.close()
 	os.remove(filename)
diff --git a/erpnext/accounts/doctype/journal_entry/journal_entry.js b/erpnext/accounts/doctype/journal_entry/journal_entry.js
index 409c15f..ff12967 100644
--- a/erpnext/accounts/doctype/journal_entry/journal_entry.js
+++ b/erpnext/accounts/doctype/journal_entry/journal_entry.js
@@ -210,7 +210,7 @@
 			$.each(this.frm.doc.accounts || [], function(i, jvd) {
 				frappe.model.set_default_values(jvd);
 			});
-			var posting_date = this.frm.posting_date;
+			var posting_date = this.frm.doc.posting_date;
 			if(!this.frm.doc.amended_from) this.frm.set_value('posting_date', posting_date || frappe.datetime.get_today());
 		}
 	},
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 50fc3bb..51fc3f7 100644
--- a/erpnext/accounts/doctype/mode_of_payment/mode_of_payment.json
+++ b/erpnext/accounts/doctype/mode_of_payment/mode_of_payment.json
@@ -1,4 +1,5 @@
 {
+ "actions": [],
  "allow_import": 1,
  "allow_rename": 1,
  "autoname": "field:mode_of_payment",
@@ -28,7 +29,7 @@
    "fieldtype": "Select",
    "in_standard_filter": 1,
    "label": "Type",
-   "options": "Cash\nBank\nGeneral"
+   "options": "Cash\nBank\nGeneral\nPhone"
   },
   {
    "fieldname": "accounts",
@@ -45,7 +46,9 @@
  ],
  "icon": "fa fa-credit-card",
  "idx": 1,
- "modified": "2020-09-18 17:26:09.703215",
+ "index_web_pages_for_search": 1,
+ "links": [],
+ "modified": "2020-09-18 17:57:23.835236",
  "modified_by": "Administrator",
  "module": "Accounts",
  "name": "Mode of Payment",
diff --git a/erpnext/accounts/doctype/opening_invoice_creation_tool/opening_invoice_creation_tool.js b/erpnext/accounts/doctype/opening_invoice_creation_tool/opening_invoice_creation_tool.js
index 699eb08..3ce5701 100644
--- a/erpnext/accounts/doctype/opening_invoice_creation_tool/opening_invoice_creation_tool.js
+++ b/erpnext/accounts/doctype/opening_invoice_creation_tool/opening_invoice_creation_tool.js
@@ -6,7 +6,7 @@
 		frm.set_query('party_type', 'invoices', function(doc, cdt, cdn) {
 			return {
 				filters: {
-					'name': ['in', 'Customer,Supplier']
+					'name': ['in', 'Customer, Supplier']
 				}
 			};
 		});
@@ -14,29 +14,46 @@
 		if (frm.doc.company) {
 			frm.trigger('setup_company_filters');
 		}
+
+		frappe.realtime.on('opening_invoice_creation_progress', data => {
+			if (!frm.doc.import_in_progress) {
+				frm.dashboard.reset();
+				frm.doc.import_in_progress = true;
+			}
+			if (data.user != frappe.session.user) return;
+			if (data.count == data.total) {
+				setTimeout((title) => {
+					frm.doc.import_in_progress = false;
+					frm.clear_table("invoices");
+					frm.refresh_fields();
+					frm.page.clear_indicator();
+					frm.dashboard.hide_progress(title);
+					frappe.msgprint(__("Opening {0} Invoice created", [frm.doc.invoice_type]));
+				}, 1500, data.title);
+				return;
+			}
+
+			frm.dashboard.show_progress(data.title, (data.count / data.total) * 100, data.message);
+			frm.page.set_indicator(__('In Progress'), 'orange');
+		});
 	},
 
 	refresh: function(frm) {
 		frm.disable_save();
-		frm.trigger("make_dashboard");
+		!frm.doc.import_in_progress && frm.trigger("make_dashboard");
 		frm.page.set_primary_action(__('Create Invoices'), () => {
 			let btn_primary = frm.page.btn_primary.get(0);
 			return frm.call({
 				doc: frm.doc,
-				freeze: true,
 				btn: $(btn_primary),
 				method: "make_invoices",
-				freeze_message: __("Creating {0} Invoice", [frm.doc.invoice_type]),
-				callback: (r) => {
-					if(!r.exc){
-						frappe.msgprint(__("Opening {0} Invoice created", [frm.doc.invoice_type]));
-						frm.clear_table("invoices");
-						frm.refresh_fields();
-						frm.reload_doc();
-					}
-				}
+				freeze_message: __("Creating {0} Invoice", [frm.doc.invoice_type])
 			});
 		});
+
+		if (frm.doc.create_missing_party) {
+			frm.set_df_property("party", "fieldtype", "Data", frm.doc.name, "invoices");
+		}
 	},
 
 	setup_company_filters: function(frm) {
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 a53417e..d51856a 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
@@ -4,9 +4,12 @@
 
 from __future__ import unicode_literals
 import frappe
+import traceback
+from json import dumps
 from frappe import _, scrub
 from frappe.utils import flt, nowdate
 from frappe.model.document import Document
+from frappe.utils.background_jobs import enqueue
 from erpnext.accounts.doctype.accounting_dimension.accounting_dimension import get_accounting_dimensions
 
 
@@ -61,67 +64,48 @@
 			prepare_invoice_summary(doctype, invoices)
 
 		return invoices_summary, max_count
-
-	def make_invoices(self):
-		names = []
-		mandatory_error_msg = _("Row {0}: {1} is required to create the Opening {2} Invoices")
+	
+	def validate_company(self):
 		if not self.company:
 			frappe.throw(_("Please select the Company"))
+	
+	def set_missing_values(self, row):
+		row.qty = row.qty or 1.0
+		row.temporary_opening_account = row.temporary_opening_account or get_temporary_opening_account(self.company)
+		row.party_type = "Customer" if self.invoice_type == "Sales" else "Supplier"
+		row.item_name = row.item_name or _("Opening Invoice Item")
+		row.posting_date = row.posting_date or nowdate()
+		row.due_date = row.due_date or nowdate()
 
-		company_details = frappe.get_cached_value('Company', self.company,
-			["default_currency", "default_letter_head"], as_dict=1) or {}
+	def validate_mandatory_invoice_fields(self, row):
+		if not frappe.db.exists(row.party_type, row.party):
+			if self.create_missing_party:
+				self.add_party(row.party_type, row.party)
+			else:
+				frappe.throw(_("Row #{}: {} {} does not exist.").format(row.idx, frappe.bold(row.party_type), frappe.bold(row.party)))
 
+		mandatory_error_msg = _("Row #{0}: {1} is required to create the Opening {2} Invoices")
+		for d in ("Party", "Outstanding Amount", "Temporary Opening Account"):
+			if not row.get(scrub(d)):
+				frappe.throw(mandatory_error_msg.format(row.idx, d, self.invoice_type))
+
+	def get_invoices(self):
+		invoices = []
 		for row in self.invoices:
-			if not row.qty:
-				row.qty = 1.0
-
-			# always mandatory fields for the invoices
-			if not row.temporary_opening_account:
-				row.temporary_opening_account = get_temporary_opening_account(self.company)
-			row.party_type = "Customer" if self.invoice_type == "Sales" else "Supplier"
-
-			# Allow to create invoice even if no party present in customer or supplier.
-			if not frappe.db.exists(row.party_type, row.party):
-				if self.create_missing_party:
-					self.add_party(row.party_type, row.party)
-				else:
-					frappe.throw(_("{0} {1} does not exist.").format(frappe.bold(row.party_type), frappe.bold(row.party)))
-
-			if not row.item_name:
-				row.item_name = _("Opening Invoice Item")
-			if not row.posting_date:
-				row.posting_date = nowdate()
-			if not row.due_date:
-				row.due_date = nowdate()
-
-			for d in ("Party", "Outstanding Amount", "Temporary Opening Account"):
-				if not row.get(scrub(d)):
-					frappe.throw(mandatory_error_msg.format(row.idx, _(d), self.invoice_type))
-
-			args = self.get_invoice_dict(row=row)
-			if not args:
+			if not row:
 				continue
-
+			self.set_missing_values(row)
+			self.validate_mandatory_invoice_fields(row)
+			invoice = self.get_invoice_dict(row)
+			company_details = frappe.get_cached_value('Company', self.company, ["default_currency", "default_letter_head"], as_dict=1) or {}
 			if company_details:
-				args.update({
+				invoice.update({
 					"currency": company_details.get("default_currency"),
 					"letter_head": company_details.get("default_letter_head")
 				})
+			invoices.append(invoice)
 
-			doc = frappe.get_doc(args).insert()
-			doc.submit()
-			names.append(doc.name)
-
-			if len(self.invoices) > 5:
-				frappe.publish_realtime(
-					"progress", dict(
-						progress=[row.idx, len(self.invoices)],
-						title=_('Creating {0}').format(doc.doctype)
-					),
-					user=frappe.session.user
-				)
-
-		return names
+		return invoices
 
 	def add_party(self, party_type, party):
 		party_doc = frappe.new_doc(party_type)
@@ -140,14 +124,12 @@
 
 	def get_invoice_dict(self, row=None):
 		def get_item_dict():
-			default_uom = frappe.db.get_single_value("Stock Settings", "stock_uom") or _("Nos")
-			cost_center = row.get('cost_center') or frappe.get_cached_value('Company',
-				self.company,  "cost_center")
-
+			cost_center = row.get('cost_center') or frappe.get_cached_value('Company', self.company,  "cost_center")
 			if not cost_center:
-				frappe.throw(
-					_("Please set the Default Cost Center in {0} company.").format(frappe.bold(self.company))
-				)
+				frappe.throw(_("Please set the Default Cost Center in {0} company.").format(frappe.bold(self.company)))
+
+			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")
 			rate = flt(row.outstanding_amount) / flt(row.qty)
 
 			return frappe._dict({
@@ -161,18 +143,9 @@
 				"cost_center": cost_center
 			})
 
-		if not row:
-			return None
-
-		party_type = "Customer"
-		income_expense_account_field = "income_account"
-		if self.invoice_type == "Purchase":
-			party_type = "Supplier"
-			income_expense_account_field = "expense_account"
-
 		item = get_item_dict()
 
-		args = frappe._dict({
+		invoice = frappe._dict({
 			"items": [item],
 			"is_opening": "Yes",
 			"set_posting_time": 1,
@@ -180,21 +153,76 @@
 			"cost_center": self.cost_center,
 			"due_date": row.due_date,
 			"posting_date": row.posting_date,
-			frappe.scrub(party_type): row.party,
+			frappe.scrub(row.party_type): row.party,
+			"is_pos": 0,
 			"doctype": "Sales Invoice" if self.invoice_type == "Sales" else "Purchase Invoice"
 		})
 
 		accounting_dimension = get_accounting_dimensions()
-
 		for dimension in accounting_dimension:
-			args.update({
+			invoice.update({
 				dimension: item.get(dimension)
 			})
 
-		if self.invoice_type == "Sales":
-			args["is_pos"] = 0
+		return invoice
 
-		return args
+	def make_invoices(self):
+		self.validate_company()
+		invoices = self.get_invoices()
+		if len(invoices) < 50:
+			return start_import(invoices)
+		else:
+			from frappe.core.page.background_jobs.background_jobs import get_info
+			from frappe.utils.scheduler import is_scheduler_inactive
+
+			if is_scheduler_inactive() and not frappe.flags.in_test:
+				frappe.throw(_("Scheduler is inactive. Cannot import data."), title=_("Scheduler Inactive"))
+
+			enqueued_jobs = [d.get("job_name") for d in get_info()]
+			if self.name not in enqueued_jobs:
+				enqueue(
+					start_import,
+					queue="default",
+					timeout=6000,
+					event="opening_invoice_creation",
+					job_name=self.name,
+					invoices=invoices,
+					now=frappe.conf.developer_mode or frappe.flags.in_test
+				)
+
+def start_import(invoices):
+	errors = 0
+	names = []
+	for idx, d in enumerate(invoices):
+		try:
+			publish(idx, len(invoices), d.doctype)
+			doc = frappe.get_doc(d)
+			doc.insert()
+			doc.submit()
+			frappe.db.commit()
+			names.append(doc.name)
+		except Exception:
+			errors += 1
+			frappe.db.rollback()
+			message = "\n".join(["Data:", dumps(d, default=str, indent=4), "--" * 50, "\nException:", traceback.format_exc()])
+			frappe.log_error(title="Error while creating Opening Invoice", message=message)
+			frappe.db.commit()
+	if errors:
+		frappe.msgprint(_("You had {} errors while creating opening invoices. Check {} for more details")
+			.format(errors, "<a href='#List/Error Log' class='variant-click'>Error Log</a>"), indicator="red", title=_("Error Occured"))
+	return names
+
+def publish(index, total, doctype):
+	if total < 5: return
+	frappe.publish_realtime(
+		"opening_invoice_creation_progress",
+		dict(
+			title=_("Opening Invoice Creation In Progress"),
+			message=_('Creating {} out of {} {}').format(index + 1, total, doctype),
+			user=frappe.session.user,
+			count=index+1,
+			total=total
+		))
 
 @frappe.whitelist()
 def get_temporary_opening_account(company=None):
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 3bfc10d..54229f5 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
@@ -44,7 +44,7 @@
 			0: ["_Test Supplier", 300, "Overdue"],
 			1: ["_Test Supplier 1", 250, "Overdue"],
 		}
-		self.check_expected_values(invoices, expected_value, invoice_type="Purchase", )
+		self.check_expected_values(invoices, expected_value, "Purchase")
 
 def get_opening_invoice_creation_dict(**args):
 	party = "Customer" if args.get("invoice_type", "Sales") == "Sales" else "Supplier"
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 8dc2628..12e6f5e 100644
--- a/erpnext/accounts/doctype/payment_gateway_account/payment_gateway_account.json
+++ b/erpnext/accounts/doctype/payment_gateway_account/payment_gateway_account.json
@@ -1,313 +1,98 @@
 {
- "allow_copy": 0, 
- "allow_guest_to_view": 0,
- "allow_import": 0, 
- "allow_rename": 0, 
- "beta": 0, 
- "creation": "2015-12-23 21:31:52.699821", 
- "custom": 0, 
- "docstatus": 0, 
- "doctype": "DocType", 
- "document_type": "", 
- "editable_grid": 1, 
+ "actions": [],
+ "creation": "2015-12-23 21:31:52.699821",
+ "doctype": "DocType",
+ "editable_grid": 1,
+ "field_order": [
+  "payment_gateway",
+  "payment_channel",
+  "is_default",
+  "column_break_4",
+  "payment_account",
+  "currency",
+  "payment_request_message",
+  "message",
+  "message_examples"
+ ],
  "fields": [
   {
-   "allow_bulk_edit": 0,
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0,
-   "fieldname": "payment_gateway", 
-   "fieldtype": "Link", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_global_search": 0,
+   "fieldname": "payment_gateway",
+   "fieldtype": "Link",
    "in_list_view": 1,
-   "in_standard_filter": 0,
-   "label": "Payment Gateway", 
-   "length": 0, 
-   "no_copy": 0, 
-   "options": "Payment Gateway", 
-   "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
-  }, 
+   "label": "Payment Gateway",
+   "options": "Payment Gateway",
+   "reqd": 1
+  },
   {
-   "allow_bulk_edit": 0,
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0,
-   "fieldname": "is_default", 
-   "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": "Is Default", 
-   "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": "is_default",
+   "fieldtype": "Check",
+   "label": "Is Default"
+  },
   {
-   "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,
-   "fieldname": "payment_account", 
-   "fieldtype": "Link", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_global_search": 0,
+   "fieldname": "payment_account",
+   "fieldtype": "Link",
    "in_list_view": 1,
-   "in_standard_filter": 0,
-   "label": "Payment 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
-  }, 
+   "label": "Payment Account",
+   "options": "Account",
+   "reqd": 1
+  },
   {
-   "allow_bulk_edit": 0,
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0,
    "fetch_from": "payment_account.account_currency",
    "fieldname": "currency",
-   "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": "Currency", 
-   "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
-  }, 
+   "fieldtype": "Read Only",
+   "label": "Currency"
+  },
   {
-   "allow_bulk_edit": 0,
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0,
-   "fieldname": "payment_request_message", 
-   "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
-  }, 
+   "depends_on": "eval: doc.payment_channel !== \"Phone\"",
+   "fieldname": "payment_request_message",
+   "fieldtype": "Section Break"
+  },
   {
-   "allow_bulk_edit": 0,
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0,
-   "default": "Please click on the link below to make your payment", 
-   "fieldname": "message", 
-   "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": "Default Payment Request Message", 
-   "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": "Please click on the link below to make your payment",
+   "fieldname": "message",
+   "fieldtype": "Small Text",
+   "label": "Default Payment Request Message"
+  },
   {
-   "allow_bulk_edit": 0,
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0,
-   "fieldname": "message_examples", 
-   "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": "Message Examples", 
-   "length": 0, 
-   "no_copy": 0, 
-   "options": "<pre><h5>Message Example</h5>\n\n&lt;p&gt; Thank You for being a part of {{ doc.company }}! We hope you are enjoying the service.&lt;/p&gt;\n\n&lt;p&gt; Please find enclosed the E Bill statement. The outstanding amount is {{ doc.grand_total }}.&lt;/p&gt;\n\n&lt;p&gt; We don't want you to be spending time running around in order to pay for your Bill.<br>After all, life is beautiful and the time you have in hand should be spent to enjoy it!<br>So here are our little ways to help you get more time for life! &lt;/p&gt;\n\n&lt;a href=\"{{ payment_url }}\"&gt; click here to pay &lt;/a&gt;\n\n</pre>\n", 
-   "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": "message_examples",
+   "fieldtype": "HTML",
+   "label": "Message Examples",
+   "options": "<pre><h5>Message Example</h5>\n\n&lt;p&gt; Thank You for being a part of {{ doc.company }}! We hope you are enjoying the service.&lt;/p&gt;\n\n&lt;p&gt; Please find enclosed the E Bill statement. The outstanding amount is {{ doc.grand_total }}.&lt;/p&gt;\n\n&lt;p&gt; We don't want you to be spending time running around in order to pay for your Bill.<br>After all, life is beautiful and the time you have in hand should be spent to enjoy it!<br>So here are our little ways to help you get more time for life! &lt;/p&gt;\n\n&lt;a href=\"{{ payment_url }}\"&gt; click here to pay &lt;/a&gt;\n\n</pre>\n"
+  },
+  {
+   "default": "Email",
+   "fieldname": "payment_channel",
+   "fieldtype": "Select",
+   "label": "Payment Channel",
+   "options": "\nEmail\nPhone"
   }
- ], 
- "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:34.970491",
- "modified_by": "Administrator", 
- "module": "Accounts", 
- "name": "Payment Gateway Account", 
- "name_case": "", 
- "owner": "Administrator", 
+ ],
+ "index_web_pages_for_search": 1,
+ "links": [],
+ "modified": "2020-09-20 13:30:27.722852",
+ "modified_by": "Administrator",
+ "module": "Accounts",
+ "name": "Payment Gateway Account",
+ "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": "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
   }
- ], 
- "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": "modified",
+ "sort_order": "DESC"
 }
\ No newline at end of file
diff --git a/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.js b/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.js
index 355fe96..6b07197 100644
--- a/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.js
+++ b/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.js
@@ -37,6 +37,11 @@
 erpnext.accounts.PaymentReconciliationController = frappe.ui.form.Controller.extend({
 	onload: function() {
 		var me = this;
+
+		this.frm.set_query("party", function() {
+			check_mandatory(me.frm);
+		});
+
 		this.frm.set_query("party_type", function() {
 			return {
 				"filters": {
@@ -46,37 +51,39 @@
 		});
 
 		this.frm.set_query('receivable_payable_account', function() {
-			if(!me.frm.doc.company || !me.frm.doc.party_type) {
-				frappe.msgprint(__("Please select Company and Party Type first"));
-			} else {
-				return{
-					filters: {
-						"company": me.frm.doc.company,
-						"is_group": 0,
-						"account_type": frappe.boot.party_account_types[me.frm.doc.party_type]
-					}
-				};
-			}
-
+			check_mandatory(me.frm);
+			return {
+				filters: {
+					"company": me.frm.doc.company,
+					"is_group": 0,
+					"account_type": frappe.boot.party_account_types[me.frm.doc.party_type]
+				}
+			};
 		});
 
 		this.frm.set_query('bank_cash_account', function() {
-			if(!me.frm.doc.company) {
-				frappe.msgprint(__("Please select Company first"));
-			} else {
-				return{
-					filters:[
-						['Account', 'company', '=', me.frm.doc.company],
-						['Account', 'is_group', '=', 0],
-						['Account', 'account_type', 'in', ['Bank', 'Cash']]
-					]
-				};
-			}
+			check_mandatory(me.frm, true);
+			return {
+				filters:[
+					['Account', 'company', '=', me.frm.doc.company],
+					['Account', 'is_group', '=', 0],
+					['Account', 'account_type', 'in', ['Bank', 'Cash']]
+				]
+			};
 		});
 
 		this.frm.set_value('party_type', '');
 		this.frm.set_value('party', '');
 		this.frm.set_value('receivable_payable_account', '');
+
+		var check_mandatory = (frm, only_company=false) => {
+			var title = __("Mandatory");
+			if (only_company && !frm.doc.company) {
+				frappe.throw({message: __("Please Select a Company First"), title: title});
+			} else if (!frm.doc.company || !frm.doc.party_type) {
+				frappe.throw({message: __("Please Select Both Company and Party Type First"), title: title});
+			}
+		};
 	},
 
 	refresh: function() {
@@ -90,7 +97,7 @@
 
 	party: function() {
 		var me = this
-		if(!me.frm.doc.receivable_payable_account && me.frm.doc.party_type && me.frm.doc.party) {
+		if (!me.frm.doc.receivable_payable_account && me.frm.doc.party_type && me.frm.doc.party) {
 			return frappe.call({
 				method: "erpnext.accounts.party.get_party_account",
 				args: {
@@ -99,7 +106,7 @@
 					party: me.frm.doc.party
 				},
 				callback: function(r) {
-					if(!r.exc && r.message) {
+					if (!r.exc && r.message) {
 						me.frm.set_value("receivable_payable_account", r.message);
 					}
 				}
diff --git a/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py b/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py
index 2f8b634..791b03a 100644
--- a/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py
+++ b/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py
@@ -99,6 +99,7 @@
 				and `tabGL Entry`.against_voucher_type = %(voucher_type)s
 				and `tab{doc}`.docstatus = 1 and `tabGL Entry`.party = %(party)s
 				and `tabGL Entry`.party_type = %(party_type)s and `tabGL Entry`.account = %(account)s
+				and `tabGL Entry`.is_cancelled = 0
 			GROUP BY `tab{doc}`.name
 			Having
 				amount > 0
diff --git a/erpnext/accounts/doctype/payment_request/payment_request.js b/erpnext/accounts/doctype/payment_request/payment_request.js
index e1e4314..901ef19 100644
--- a/erpnext/accounts/doctype/payment_request/payment_request.js
+++ b/erpnext/accounts/doctype/payment_request/payment_request.js
@@ -25,7 +25,7 @@
 })
 
 frappe.ui.form.on("Payment Request", "refresh", function(frm) {
-	if(frm.doc.payment_request_type == 'Inward' &&
+	if(frm.doc.payment_request_type == 'Inward' && frm.doc.payment_channel !== "Phone" &&
 		!in_list(["Initiated", "Paid"], frm.doc.status) && !frm.doc.__islocal && frm.doc.docstatus==1){
 		frm.add_custom_button(__('Resend Payment Email'), function(){
 			frappe.call({
diff --git a/erpnext/accounts/doctype/payment_request/payment_request.json b/erpnext/accounts/doctype/payment_request/payment_request.json
index 8eadfd0..2ee356a 100644
--- a/erpnext/accounts/doctype/payment_request/payment_request.json
+++ b/erpnext/accounts/doctype/payment_request/payment_request.json
@@ -48,6 +48,7 @@
   "section_break_7",
   "payment_gateway",
   "payment_account",
+  "payment_channel",
   "payment_order",
   "amended_from"
  ],
@@ -230,6 +231,7 @@
    "label": "Recipient Message And Payment Details"
   },
   {
+   "depends_on": "eval: doc.payment_channel != \"Phone\"",
    "fieldname": "print_format",
    "fieldtype": "Select",
    "label": "Print Format"
@@ -241,6 +243,7 @@
    "label": "To"
   },
   {
+   "depends_on": "eval: doc.payment_channel != \"Phone\"",
    "fieldname": "subject",
    "fieldtype": "Data",
    "in_global_search": 1,
@@ -277,16 +280,18 @@
    "read_only": 1
   },
   {
-   "depends_on": "eval: doc.payment_request_type == 'Inward'",
+   "depends_on": "eval: doc.payment_request_type == 'Inward' || doc.payment_channel != \"Phone\"",
    "fieldname": "section_break_10",
    "fieldtype": "Section Break"
   },
   {
+   "depends_on": "eval: doc.payment_channel != \"Phone\"",
    "fieldname": "message",
    "fieldtype": "Text",
    "label": "Message"
   },
   {
+   "depends_on": "eval: doc.payment_channel != \"Phone\"",
    "fieldname": "message_examples",
    "fieldtype": "HTML",
    "label": "Message Examples",
@@ -347,12 +352,21 @@
    "options": "Payment Request",
    "print_hide": 1,
    "read_only": 1
+  },
+  {
+   "fetch_from": "payment_gateway_account.payment_channel",
+   "fieldname": "payment_channel",
+   "fieldtype": "Select",
+   "label": "Payment Channel",
+   "options": "\nEmail\nPhone",
+   "read_only": 1
   }
  ],
  "in_create": 1,
+ "index_web_pages_for_search": 1,
  "is_submittable": 1,
  "links": [],
- "modified": "2020-07-17 14:06:42.185763",
+ "modified": "2020-09-18 12:24:14.178853",
  "modified_by": "Administrator",
  "module": "Accounts",
  "name": "Payment Request",
diff --git a/erpnext/accounts/doctype/payment_request/payment_request.py b/erpnext/accounts/doctype/payment_request/payment_request.py
index e93ec95..1b97050 100644
--- a/erpnext/accounts/doctype/payment_request/payment_request.py
+++ b/erpnext/accounts/doctype/payment_request/payment_request.py
@@ -36,7 +36,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"):
-				ref_amount = get_amount(ref_doc)
+				ref_amount = get_amount(ref_doc, self.payment_account)
 
 				if existing_payment_request_amount + flt(self.grand_total)> ref_amount:
 					frappe.throw(_("Total Payment Request amount cannot be greater than {0} amount")
@@ -76,11 +76,25 @@
 			or self.flags.mute_email:
 			send_mail = False
 
-		if send_mail:
+		if send_mail and self.payment_channel != "Phone":
 			self.set_payment_request_url()
 			self.send_email()
 			self.make_communication_entry()
 
+		elif self.payment_channel == "Phone":
+			controller = get_payment_gateway_controller(self.payment_gateway)
+			payment_record = dict(
+				reference_doctype="Payment Request",
+				reference_docname=self.name,
+				payment_reference=self.reference_name,
+				grand_total=self.grand_total,
+				sender=self.email_to,
+				currency=self.currency,
+				payment_gateway=self.payment_gateway
+			)
+			controller.validate_transaction_currency(self.currency)
+			controller.request_for_payment(**payment_record)
+
 	def on_cancel(self):
 		self.check_if_payment_entry_exists()
 		self.set_as_cancelled()
@@ -105,13 +119,14 @@
 			return False
 
 	def set_payment_request_url(self):
-		if self.payment_account:
+		if self.payment_account and self.payment_channel != "Phone":
 			self.payment_url = self.get_payment_url()
 
 		if self.payment_url:
 			self.db_set('payment_url', self.payment_url)
 
-		if self.payment_url or not self.payment_gateway_account:
+		if self.payment_url or not self.payment_gateway_account \
+			or (self.payment_gateway_account and self.payment_channel == "Phone"):
 			self.db_set('status', 'Initiated')
 
 	def get_payment_url(self):
@@ -140,10 +155,14 @@
 		})
 
 	def set_as_paid(self):
-		payment_entry = self.create_payment_entry()
-		self.make_invoice()
+		if self.payment_channel == "Phone":
+			self.db_set("status", "Paid")
 
-		return payment_entry
+		else:
+			payment_entry = self.create_payment_entry()
+			self.make_invoice()
+
+			return payment_entry
 
 	def create_payment_entry(self, submit=True):
 		"""create entry"""
@@ -151,7 +170,7 @@
 
 		ref_doc = frappe.get_doc(self.reference_doctype, self.reference_name)
 
-		if self.reference_doctype == "Sales Invoice":
+		if self.reference_doctype in ["Sales Invoice", "POS Invoice"]:
 			party_account = ref_doc.debit_to
 		elif self.reference_doctype == "Purchase Invoice":
 			party_account = ref_doc.credit_to
@@ -166,8 +185,8 @@
 		else:
 			party_amount = self.grand_total
 
-		payment_entry = get_payment_entry(self.reference_doctype, self.reference_name,
-			party_amount=party_amount, bank_account=self.payment_account, bank_amount=bank_amount)
+		payment_entry = get_payment_entry(self.reference_doctype, self.reference_name, party_amount=party_amount,
+			bank_account=self.payment_account, bank_amount=bank_amount)
 
 		payment_entry.update({
 			"reference_no": self.name,
@@ -255,7 +274,7 @@
 
 			# if shopping cart enabled and in session
 			if (shopping_cart_settings.enabled and hasattr(frappe.local, "session")
-				and frappe.local.session.user != "Guest"):
+				and frappe.local.session.user != "Guest") and self.payment_channel != "Phone":
 
 				success_url = shopping_cart_settings.payment_success_url
 				if success_url:
@@ -280,7 +299,9 @@
 	args = frappe._dict(args)
 
 	ref_doc = frappe.get_doc(args.dt, args.dn)
-	grand_total = get_amount(ref_doc)
+	gateway_account = get_gateway_details(args) or frappe._dict()
+
+	grand_total = get_amount(ref_doc, gateway_account.get("payment_account"))
 	if args.loyalty_points and args.dt == "Sales Order":
 		from erpnext.accounts.doctype.loyalty_program.loyalty_program import validate_loyalty_points
 		loyalty_amount = validate_loyalty_points(ref_doc, int(args.loyalty_points))
@@ -288,8 +309,6 @@
 		frappe.db.set_value("Sales Order", args.dn, "loyalty_amount", loyalty_amount, update_modified=False)
 		grand_total = grand_total - loyalty_amount
 
-	gateway_account = get_gateway_details(args) or frappe._dict()
-
 	bank_account = (get_party_bank_account(args.get('party_type'), args.get('party'))
 		if args.get('party_type') else '')
 
@@ -314,9 +333,11 @@
 			"payment_gateway_account": gateway_account.get("name"),
 			"payment_gateway": gateway_account.get("payment_gateway"),
 			"payment_account": gateway_account.get("payment_account"),
+			"payment_channel": gateway_account.get("payment_channel"),
 			"payment_request_type": args.get("payment_request_type"),
 			"currency": ref_doc.currency,
 			"grand_total": grand_total,
+			"mode_of_payment": args.mode_of_payment,
 			"email_to": args.recipient_id or ref_doc.owner,
 			"subject": _("Payment Request for {0}").format(args.dn),
 			"message": gateway_account.get("message") or get_dummy_message(ref_doc),
@@ -344,7 +365,7 @@
 
 	return pr.as_dict()
 
-def get_amount(ref_doc):
+def get_amount(ref_doc, payment_account=None):
 	"""get amount based on doctype"""
 	dt = ref_doc.doctype
 	if dt in ["Sales Order", "Purchase Order"]:
@@ -356,6 +377,12 @@
 		else:
 			grand_total = flt(ref_doc.outstanding_amount) / ref_doc.conversion_rate
 
+	elif dt == "POS Invoice":
+		for pay in ref_doc.payments:
+			if pay.type == "Phone" and pay.account == payment_account:
+				grand_total = pay.amount
+				break
+
 	elif dt == "Fees":
 		grand_total = ref_doc.outstanding_amount
 
@@ -366,6 +393,10 @@
 		frappe.throw(_("Payment Entry is already created"))
 
 def get_existing_payment_request_amount(ref_dt, ref_dn):
+	"""
+	Get the existing payment request which are unpaid or partially paid for payment channel other than Phone
+	and get the summation of existing paid payment request for Phone payment channel.
+	"""
 	existing_payment_request_amount = frappe.db.sql("""
 		select sum(grand_total)
 		from `tabPayment Request`
@@ -373,7 +404,9 @@
 			reference_doctype = %s
 			and reference_name = %s
 			and docstatus = 1
-			and status != 'Paid'
+			and (status != 'Paid'
+			or (payment_channel = 'Phone'
+				and status = 'Paid'))
 	""", (ref_dt, ref_dn))
 	return flt(existing_payment_request_amount[0][0]) if existing_payment_request_amount else 0
 
diff --git a/erpnext/accounts/doctype/payment_term/payment_term.json b/erpnext/accounts/doctype/payment_term/payment_term.json
index 723d3bd..e77c244 100644
--- a/erpnext/accounts/doctype/payment_term/payment_term.json
+++ b/erpnext/accounts/doctype/payment_term/payment_term.json
@@ -45,6 +45,7 @@
    "unique": 0
   }, 
   {
+   "description": "Provide the invoice portion in percent",
    "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 1, 
@@ -170,6 +171,7 @@
    "unique": 0
   }, 
   {
+   "description": "Give number of days according to prior selection",
    "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 1, 
@@ -305,7 +307,7 @@
  "issingle": 0, 
  "istable": 0, 
  "max_attachments": 0, 
- "modified": "2018-03-08 10:47:32.830478", 
+ "modified": "2020-10-14 10:47:32.830478", 
  "modified_by": "Administrator", 
  "module": "Accounts", 
  "name": "Payment Term", 
@@ -381,4 +383,4 @@
  "sort_order": "DESC", 
  "track_changes": 1, 
  "track_seen": 0
-}
\ No newline at end of file
+}
diff --git a/erpnext/accounts/doctype/pos_invoice/pos_invoice.js b/erpnext/accounts/doctype/pos_invoice/pos_invoice.js
index 3be4304..c43cb79 100644
--- a/erpnext/accounts/doctype/pos_invoice/pos_invoice.js
+++ b/erpnext/accounts/doctype/pos_invoice/pos_invoice.js
@@ -201,5 +201,22 @@
 			}
 			frm.set_value("loyalty_amount", loyalty_amount);
 		}
+	},
+
+	request_for_payment: function (frm) {
+		frm.save().then(() => {
+			frappe.dom.freeze();
+			frappe.call({
+				method: 'create_payment_request',
+				doc: frm.doc,
+			})
+				.fail(() => {
+					frappe.dom.unfreeze();
+					frappe.msgprint('Payment request failed');
+				})
+				.then(() => {
+					frappe.msgprint('Payment request sent successfully');
+				});
+		});
 	}
 });
\ 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 4780688..1cff3c6 100644
--- a/erpnext/accounts/doctype/pos_invoice/pos_invoice.json
+++ b/erpnext/accounts/doctype/pos_invoice/pos_invoice.json
@@ -279,8 +279,7 @@
    "fieldtype": "Check",
    "label": "Is Return (Credit Note)",
    "no_copy": 1,
-   "print_hide": 1,
-   "set_only_once": 1
+   "print_hide": 1
   },
   {
    "fieldname": "column_break1",
@@ -461,7 +460,7 @@
   },
   {
    "fieldname": "contact_mobile",
-   "fieldtype": "Small Text",
+   "fieldtype": "Data",
    "hidden": 1,
    "label": "Mobile No",
    "read_only": 1
@@ -1579,10 +1578,9 @@
   }
  ],
  "icon": "fa fa-file-text",
- "index_web_pages_for_search": 1,
  "is_submittable": 1,
  "links": [],
- "modified": "2020-09-07 12:43:09.138720",
+ "modified": "2020-09-28 16:51:24.641755",
  "modified_by": "Administrator",
  "module": "Accounts",
  "name": "POS Invoice",
diff --git a/erpnext/accounts/doctype/pos_invoice/pos_invoice.py b/erpnext/accounts/doctype/pos_invoice/pos_invoice.py
index 1669ca4..5b0822e 100644
--- a/erpnext/accounts/doctype/pos_invoice/pos_invoice.py
+++ b/erpnext/accounts/doctype/pos_invoice/pos_invoice.py
@@ -15,6 +15,7 @@
 
 from erpnext.accounts.doctype.sales_invoice.sales_invoice import SalesInvoice, get_bank_cash_account, update_multi_mode_option
 from erpnext.stock.doctype.serial_no.serial_no import get_pos_reserved_serial_nos
+from erpnext.accounts.doctype.payment_request.payment_request import make_payment_request
 
 from six import iteritems
 
@@ -57,6 +58,7 @@
 			against_psi_doc.make_loyalty_point_entry()
 		if self.redeem_loyalty_points and self.loyalty_points:
 			self.apply_loyalty_points()
+		self.check_phone_payments()
 		self.set_status(update=True)
 
 	def on_cancel(self):
@@ -69,6 +71,18 @@
 			against_psi_doc.delete_loyalty_point_entry()
 			against_psi_doc.make_loyalty_point_entry()
 
+	def check_phone_payments(self):
+		for pay in self.payments:
+			if pay.type == "Phone" and pay.amount >= 0:
+				paid_amt = frappe.db.get_value("Payment Request",
+					filters=dict(
+						reference_doctype="POS Invoice", reference_name=self.name,
+						mode_of_payment=pay.mode_of_payment, status="Paid"),
+					fieldname="grand_total")
+
+				if pay.amount != paid_amt:
+					return frappe.throw(_("Payment related to {0} is not completed").format(pay.mode_of_payment))
+
 	def validate_stock_availablility(self):
 		allow_negative_stock = frappe.db.get_value('Stock Settings', None, 'allow_negative_stock')
 
@@ -92,21 +106,19 @@
 
 				if len(invalid_serial_nos):
 					multiple_nos = 's' if len(invalid_serial_nos) > 1 else ''
-					frappe.throw(_("Row #{}: Serial No{}. {} has already been transacted into another POS Invoice. \
-						Please select valid serial no.".format(d.idx, multiple_nos,
-						frappe.bold(', '.join(invalid_serial_nos)))), title=_("Not Available"))
+					frappe.throw(_("Row #{}: Serial No{}. {} has already been transacted into another POS Invoice. Please select valid serial no.").format(
+						d.idx, multiple_nos, frappe.bold(', '.join(invalid_serial_nos))), title=_("Not Available"))
 			else:
 				if allow_negative_stock:
 					return
 
 				available_stock = get_stock_availability(d.item_code, d.warehouse)
 				if not (flt(available_stock) > 0):
-					frappe.throw(_('Row #{}: Item Code: {} is not available under warehouse {}.'
-						.format(d.idx, frappe.bold(d.item_code), frappe.bold(d.warehouse))), title=_("Not Available"))
+					frappe.throw(_('Row #{}: Item Code: {} is not available under warehouse {}.').format(
+						d.idx, frappe.bold(d.item_code), frappe.bold(d.warehouse)), title=_("Not Available"))
 				elif flt(available_stock) < flt(d.qty):
-					frappe.msgprint(_('Row #{}: Stock quantity not enough for Item Code: {} under warehouse {}. \
-						Available quantity {}.'.format(d.idx, frappe.bold(d.item_code),
-						frappe.bold(d.warehouse), frappe.bold(d.qty))), title=_("Not Available"))
+					frappe.msgprint(_('Row #{}: Stock quantity not enough for Item Code: {} under warehouse {}. Available quantity {}.').format(
+						d.idx, frappe.bold(d.item_code), frappe.bold(d.warehouse), frappe.bold(d.qty)), title=_("Not Available"))
 
 	def validate_serialised_or_batched_item(self):
 		for d in self.get("items"):
@@ -117,14 +129,14 @@
 
 
 			if serialized and batched and (no_batch_selected or no_serial_selected):
-				frappe.throw(_('Row #{}: Please select a serial no and batch against item: {} or remove it to complete transaction.'
-						.format(d.idx, frappe.bold(d.item_code))), title=_("Invalid Item"))
+				frappe.throw(_('Row #{}: Please select a serial no and batch against item: {} or remove it to complete transaction.').format(
+					d.idx, frappe.bold(d.item_code)), title=_("Invalid Item"))
 			if serialized and no_serial_selected:
-				frappe.throw(_('Row #{}: No serial number selected against item: {}. Please select one or remove it to complete transaction.'
-						.format(d.idx, frappe.bold(d.item_code))), title=_("Invalid Item"))
+				frappe.throw(_('Row #{}: No serial number selected against item: {}. Please select one or remove it to complete transaction.').format(
+					d.idx, frappe.bold(d.item_code)), title=_("Invalid Item"))
 			if batched and no_batch_selected:
-				frappe.throw(_('Row #{}: No batch selected against item: {}. Please select a batch or remove it to complete transaction.'
-						.format(d.idx, frappe.bold(d.item_code))), title=_("Invalid Item"))
+				frappe.throw(_('Row #{}: No batch selected against item: {}. Please select a batch or remove it to complete transaction.').format(
+					d.idx, frappe.bold(d.item_code)), title=_("Invalid Item"))
 
 	def validate_return_items(self):
 		if not self.get("is_return"): return
@@ -151,7 +163,7 @@
 			self.base_change_amount = flt(self.base_paid_amount - base_grand_total + flt(self.base_write_off_amount))
 
 		if flt(self.change_amount) and not self.account_for_change_amount:
-			msgprint(_("Please enter Account for Change Amount"), raise_exception=1)
+			frappe.msgprint(_("Please enter Account for Change Amount"), raise_exception=1)
 
 	def verify_payment_amount(self):
 		for entry in self.payments:
@@ -167,7 +179,7 @@
 				total_amount_in_payments += payment.amount
 			invoice_total = self.rounded_total or self.grand_total
 			if total_amount_in_payments < invoice_total:
-				frappe.throw(_("Total payments amount can't be greater than {}".format(-invoice_total)))
+				frappe.throw(_("Total payments amount can't be greater than {}").format(-invoice_total))
 
 	def validate_loyalty_transaction(self):
 		if self.redeem_loyalty_points and (not self.loyalty_redemption_account or not self.loyalty_redemption_cost_center):
@@ -314,6 +326,32 @@
 			if not pay.account:
 				pay.account = get_bank_cash_account(pay.mode_of_payment, self.company).get("account")
 
+	def create_payment_request(self):
+		for pay in self.payments:
+			if pay.type == "Phone":
+				if pay.amount <= 0:
+					frappe.throw(_("Payment amount cannot be less than or equal to 0"))
+
+				if not self.contact_mobile:
+					frappe.throw(_("Please enter the phone number first"))
+
+				payment_gateway = frappe.db.get_value("Payment Gateway Account", {
+					"payment_account": pay.account,
+				})
+				record = {
+					"payment_gateway": payment_gateway,
+					"dt": "POS Invoice",
+					"dn": self.name,
+					"payment_request_type": "Inward",
+					"party_type": "Customer",
+					"party": self.customer,
+					"mode_of_payment": pay.mode_of_payment,
+					"recipient_id": self.contact_mobile,
+					"submit_doc": True
+				}
+
+				return make_payment_request(**record)
+
 @frappe.whitelist()
 def get_stock_availability(item_code, warehouse):
 	latest_sle = frappe.db.sql("""select qty_after_transaction
diff --git a/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.json b/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.json
index d62e73b..8925b87 100644
--- a/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.json
+++ b/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.json
@@ -361,6 +361,7 @@
    "fieldname": "bill_date",
    "fieldtype": "Date",
    "label": "Supplier Invoice Date",
+   "no_copy": 1,
    "oldfieldname": "bill_date",
    "oldfieldtype": "Date",
    "print_hide": 1
@@ -1333,8 +1334,7 @@
  "icon": "fa fa-file-text",
  "idx": 204,
  "is_submittable": 1,
- "links": [],
- "modified": "2020-08-03 23:20:04.466153",
+ "modified": "2020-09-21 12:22:09.164068",
  "modified_by": "Administrator",
  "module": "Accounts",
  "name": "Purchase Invoice",
diff --git a/erpnext/accounts/doctype/sales_invoice/sales_invoice.py b/erpnext/accounts/doctype/sales_invoice/sales_invoice.py
index 206340b..801e688 100644
--- a/erpnext/accounts/doctype/sales_invoice/sales_invoice.py
+++ b/erpnext/accounts/doctype/sales_invoice/sales_invoice.py
@@ -572,7 +572,8 @@
 
 	def validate_pos(self):
 		if self.is_return:
-			if flt(self.paid_amount) + flt(self.write_off_amount) - flt(self.grand_total) > \
+			invoice_total = self.rounded_total or self.grand_total
+			if flt(self.paid_amount) + flt(self.write_off_amount) - flt(invoice_total) > \
 				1.0/(10.0**(self.precision("grand_total") + 1.0)):
 					frappe.throw(_("Paid amount + Write Off Amount can not be greater than Grand Total"))
 
diff --git a/erpnext/accounts/general_ledger.py b/erpnext/accounts/general_ledger.py
index c12e006d..9a091bf 100644
--- a/erpnext/accounts/general_ledger.py
+++ b/erpnext/accounts/general_ledger.py
@@ -171,7 +171,7 @@
 					frappe.throw(_("Account: {0} can only be updated via Stock Transactions")
 						.format(account), StockAccountInvalidTransaction)
 
-			elif account_bal != stock_bal:
+			elif abs(account_bal - stock_bal) > 0.1:
 				precision = get_field_precision(frappe.get_meta("GL Entry").get_field("debit"),
 					currency=frappe.get_cached_value('Company',  gl_map[0].company,  "default_currency"))
 
diff --git a/erpnext/accounts/module_onboarding/accounts/accounts.json b/erpnext/accounts/module_onboarding/accounts/accounts.json
index ba1a779..570d2bd 100644
--- a/erpnext/accounts/module_onboarding/accounts/accounts.json
+++ b/erpnext/accounts/module_onboarding/accounts/accounts.json
@@ -20,7 +20,7 @@
  "owner": "Administrator",
  "steps": [
   {
-   "step": "Chart Of Accounts"
+   "step": "Chart of Accounts"
   },
   {
    "step": "Setup Taxes"
diff --git a/erpnext/accounts/onboarding_step/chart_of_accounts/chart_of_accounts.json b/erpnext/accounts/onboarding_step/chart_of_accounts/chart_of_accounts.json
index cbd022b..48637bf 100644
--- a/erpnext/accounts/onboarding_step/chart_of_accounts/chart_of_accounts.json
+++ b/erpnext/accounts/onboarding_step/chart_of_accounts/chart_of_accounts.json
@@ -10,11 +10,11 @@
  "is_skipped": 0,
  "modified": "2020-05-14 17:40:28.410447",
  "modified_by": "Administrator",
- "name": "Chart Of Accounts",
+ "name": "Chart of Accounts",
  "owner": "Administrator",
  "path": "Tree/Account",
  "reference_document": "Account",
  "show_full_form": 0,
- "title": "Review Chart Of Accounts",
+ "title": "Review Chart of Accounts",
  "validate_action": 0
 }
\ No newline at end of file
diff --git a/erpnext/accounts/page/bank_reconciliation/bank_reconciliation.py b/erpnext/accounts/page/bank_reconciliation/bank_reconciliation.py
index ce6baa6..8abe20c 100644
--- a/erpnext/accounts/page/bank_reconciliation/bank_reconciliation.py
+++ b/erpnext/accounts/page/bank_reconciliation/bank_reconciliation.py
@@ -19,8 +19,7 @@
 	gl_entry = frappe.get_doc("GL Entry", dict(account=account, voucher_type=payment_doctype, voucher_no=payment_name))
 
 	if payment_doctype == "Payment Entry" and payment_entry.unallocated_amount > transaction.unallocated_amount:
-		frappe.throw(_("The unallocated amount of Payment Entry {0} \
-			is greater than the Bank Transaction's unallocated amount").format(payment_name))
+		frappe.throw(_("The unallocated amount of Payment Entry {0} is greater than the Bank Transaction's unallocated amount").format(payment_name))
 
 	if transaction.unallocated_amount == 0:
 		frappe.throw(_("This bank transaction is already fully reconciled"))
@@ -83,50 +82,30 @@
 		"party", "party_type", "posting_date", "{0}".format(currency_field)], filters=[["paid_amount", "like", "{0}%".format(amount)],
 		["docstatus", "=", "1"], ["payment_type", "=", [payment_type, "Internal Transfer"]], ["ifnull(clearance_date, '')", "=", ""], ["{0}".format(account_from_to), "=", "{0}".format(bank_account)]])
 
-	if transaction.credit > 0:
-		journal_entries = frappe.db.sql("""
-			SELECT
-				'Journal Entry' as doctype, je.name, je.posting_date, je.cheque_no as reference_no,
-				je.pay_to_recd_from as party, je.cheque_date as reference_date, jea.debit_in_account_currency as paid_amount
-			FROM
-				`tabJournal Entry Account` as jea
-			JOIN
-				`tabJournal Entry` as je
-			ON
-				jea.parent = je.name
-			WHERE
-				(je.clearance_date is null or je.clearance_date='0000-00-00')
-			AND
-				jea.account = %s
-			AND
-				jea.debit_in_account_currency like %s
-			AND
-				je.docstatus = 1
-		""", (bank_account, amount), as_dict=True)
-	else:
-		journal_entries = frappe.db.sql("""
-			SELECT
-				'Journal Entry' as doctype, je.name, je.posting_date, je.cheque_no as reference_no,
-				jea.account_currency as currency, je.pay_to_recd_from as party, je.cheque_date as reference_date,
-				jea.credit_in_account_currency as paid_amount
-			FROM
-				`tabJournal Entry Account` as jea
-			JOIN
-				`tabJournal Entry` as je
-			ON
-				jea.parent = je.name
-			WHERE
-				(je.clearance_date is null or je.clearance_date='0000-00-00')
-			AND
-				jea.account = %(bank_account)s
-			AND
-				jea.credit_in_account_currency like %(txt)s
-			AND
-				je.docstatus = 1
-		""", {
-			'bank_account': bank_account,
-			'txt': '%%%s%%' % amount
-		}, as_dict=True)
+	jea_side = "debit" if transaction.credit > 0 else "credit"
+	journal_entries = frappe.db.sql(f"""
+		SELECT
+			'Journal Entry' as doctype, je.name, je.posting_date, je.cheque_no as reference_no,
+			jea.account_currency as currency, je.pay_to_recd_from as party, je.cheque_date as reference_date,
+			jea.{jea_side}_in_account_currency as paid_amount
+		FROM
+			`tabJournal Entry Account` as jea
+		JOIN
+			`tabJournal Entry` as je
+		ON
+			jea.parent = je.name
+		WHERE
+			(je.clearance_date is null or je.clearance_date='0000-00-00')
+		AND
+			jea.account = %(bank_account)s
+		AND
+			jea.{jea_side}_in_account_currency like %(txt)s
+		AND
+			je.docstatus = 1
+	""", {
+		'bank_account': bank_account,
+		'txt': '%%%s%%' % amount
+	}, as_dict=True)
 
 	if transaction.credit > 0:
 		sales_invoices = frappe.db.sql("""
@@ -264,7 +243,11 @@
 						continue
 
 				if "reference_no" in am_match and "reference_no" in des_match:
-					if difflib.SequenceMatcher(lambda x: x == " ", am_match["reference_no"], des_match["reference_no"]).ratio() > 70:
+					# Sequence Matcher does not handle None as input
+					am_reference = am_match["reference_no"] or ""
+					des_reference = des_match["reference_no"] or ""
+
+					if difflib.SequenceMatcher(lambda x: x == " ", am_reference, des_reference).ratio() > 70:
 						if am_match not in result:
 							result.append(am_match)
 		if result:
diff --git a/erpnext/accounts/party.py b/erpnext/accounts/party.py
index 2f800bb..e8d3cd3 100644
--- a/erpnext/accounts/party.py
+++ b/erpnext/accounts/party.py
@@ -203,7 +203,7 @@
 	return out
 
 @frappe.whitelist()
-def get_party_account(party_type, party, company):
+def get_party_account(party_type, party, company=None):
 	"""Returns the account for the given `party`.
 		Will first search in party (Customer / Supplier) record, if not found,
 		will search in group (Customer Group / Supplier Group),
diff --git a/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.js b/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.js
index 57fe4b0..8f02849 100644
--- a/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.js
+++ b/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.js
@@ -4,6 +4,14 @@
 frappe.query_reports["Bank Reconciliation Statement"] = {
 	"filters": [
 		{
+			"fieldname":"company",
+			"label": __("Company"),
+			"fieldtype": "Link",
+			"options": "Company",
+			"reqd": 1,
+			"default": frappe.defaults.get_user_default("Company")
+		},
+		{
 			"fieldname":"account",
 			"label": __("Bank Account"),
 			"fieldtype": "Link",
@@ -12,11 +20,14 @@
 				locals[":Company"][frappe.defaults.get_user_default("Company")]["default_bank_account"]: "",
 			"reqd": 1,
 			"get_query": function() {
+				var company = frappe.query_report.get_filter_value('company')
 				return {
 					"query": "erpnext.controllers.queries.get_account_list",
 					"filters": [
 						['Account', 'account_type', 'in', 'Bank, Cash'],
 						['Account', 'is_group', '=', 0],
+						['Account', 'disabled', '=', 0],
+						['Account', 'company', '=', company],
 					]
 				}
 			}
@@ -34,4 +45,4 @@
 			"fieldtype": "Check"
 		},
 	]
-}
\ No newline at end of file
+}
diff --git a/erpnext/accounts/utils.py b/erpnext/accounts/utils.py
index 008f6e8..53677cd 100644
--- a/erpnext/accounts/utils.py
+++ b/erpnext/accounts/utils.py
@@ -796,7 +796,7 @@
 
 	return acc
 
-def create_payment_gateway_account(gateway):
+def create_payment_gateway_account(gateway, payment_channel="Email"):
 	from erpnext.setup.setup_wizard.operations.company_setup import create_bank_account
 
 	company = frappe.db.get_value("Global Defaults", None, "default_company")
@@ -831,7 +831,8 @@
 			"is_default": 1,
 			"payment_gateway": gateway,
 			"payment_account": bank_account.name,
-			"currency": bank_account.account_currency
+			"currency": bank_account.account_currency,
+			"payment_channel": payment_channel
 		}).insert(ignore_permissions=True)
 
 	except frappe.DuplicateEntryError:
diff --git a/erpnext/buying/doctype/buying_settings/buying_settings.json b/erpnext/buying/doctype/buying_settings/buying_settings.json
index a0ab2a0..618212d 100644
--- a/erpnext/buying/doctype/buying_settings/buying_settings.json
+++ b/erpnext/buying/doctype/buying_settings/buying_settings.json
@@ -46,26 +46,26 @@
   {
    "fieldname": "po_required",
    "fieldtype": "Select",
-   "label": "Purchase Order Required for Purchase Invoice & Receipt Creation",
+   "label": "Is Purchase Order Required for Purchase Invoice & Receipt Creation?",
    "options": "No\nYes"
   },
   {
    "fieldname": "pr_required",
    "fieldtype": "Select",
-   "label": "Purchase Receipt Required for Purchase Invoice Creation",
+   "label": "Is Purchase Receipt Required for Purchase Invoice Creation?",
    "options": "No\nYes"
   },
   {
    "default": "0",
    "fieldname": "maintain_same_rate",
    "fieldtype": "Check",
-   "label": "Maintain same rate throughout purchase cycle"
+   "label": "Maintain Same Rate Throughout the Purchase Cycle"
   },
   {
    "default": "0",
    "fieldname": "allow_multiple_items",
    "fieldtype": "Check",
-   "label": "Allow Item to be added multiple times in a transaction"
+   "label": "Allow Item To Be Added Multiple Times in a Transaction"
   },
   {
    "fieldname": "subcontract",
@@ -93,9 +93,10 @@
  ],
  "icon": "fa fa-cog",
  "idx": 1,
+ "index_web_pages_for_search": 1,
  "issingle": 1,
  "links": [],
- "modified": "2020-05-15 14:49:32.513611",
+ "modified": "2020-10-13 12:00:23.276329",
  "modified_by": "Administrator",
  "module": "Buying",
  "name": "Buying Settings",
@@ -113,4 +114,4 @@
  ],
  "sort_field": "modified",
  "sort_order": "DESC"
-}
\ No newline at end of file
+}
diff --git a/erpnext/buying/doctype/purchase_order/test_purchase_order.py b/erpnext/buying/doctype/purchase_order/test_purchase_order.py
index 7c8ae6c..0cf3d24 100644
--- a/erpnext/buying/doctype/purchase_order/test_purchase_order.py
+++ b/erpnext/buying/doctype/purchase_order/test_purchase_order.py
@@ -203,9 +203,39 @@
 		frappe.set_user("Administrator")
 
 	def test_update_child_with_tax_template(self):
+		"""
+			Test Action: Create a PO with one item having its tax account head already in the PO.
+			Add the same item + new item with tax template via Update Items.
+			Expected result: First Item's tax row is updated. New tax row is added for second Item.
+		"""
+		if not frappe.db.exists("Item", "Test Item with Tax"):
+			make_item("Test Item with Tax", {
+				'is_stock_item': 1,
+			})
+
+		if not frappe.db.exists("Item Tax Template", {"title": 'Test Update Items Template'}):
+			frappe.get_doc({
+				'doctype': 'Item Tax Template',
+				'title': 'Test Update Items Template',
+				'company': '_Test Company',
+				'taxes': [
+					{
+						'tax_type': "_Test Account Service Tax - _TC",
+						'tax_rate': 10,
+					}
+				]
+			}).insert()
+
+		new_item_with_tax = frappe.get_doc("Item", "Test Item with Tax")
+
+		new_item_with_tax.append("taxes", {
+			"item_tax_template": "Test Update Items Template",
+			"valid_from": nowdate()
+		})
+		new_item_with_tax.save()
+
 		tax_template = "_Test Account Excise Duty @ 10"
 		item =  "_Test Item Home Desktop 100"
-
 		if not frappe.db.exists("Item Tax", {"parent":item, "item_tax_template":tax_template}):
 			item_doc = frappe.get_doc("Item", item)
 			item_doc.append("taxes", {
@@ -237,17 +267,25 @@
 
 		items = json.dumps([
 			{'item_code' : item, 'rate' : 500, 'qty' : 1, 'docname': po.items[0].name},
-			{'item_code' : item, 'rate' : 100, 'qty' : 1} # added item
+			{'item_code' : item, 'rate' : 100, 'qty' : 1}, # added item whose tax account head already exists in PO
+			{'item_code' : new_item_with_tax.name, 'rate' : 100, 'qty' : 1} # added item whose tax account head  is missing in PO
 		])
 		update_child_qty_rate('Purchase Order', items, po.name)
 
 		po.reload()
-		self.assertEqual(po.taxes[0].tax_amount, 60)
-		self.assertEqual(po.taxes[0].total, 660)
+		self.assertEqual(po.taxes[0].tax_amount, 70)
+		self.assertEqual(po.taxes[0].total, 770)
+		self.assertEqual(po.taxes[1].account_head, "_Test Account Service Tax - _TC")
+		self.assertEqual(po.taxes[1].tax_amount, 70)
+		self.assertEqual(po.taxes[1].total, 840)
 
+		# teardown
 		frappe.db.sql("""UPDATE `tabItem Tax` set valid_from = NULL
-				where parent = %(item)s and item_tax_template = %(tax)s""",
-					{"item": item, "tax": tax_template})
+			where parent = %(item)s and item_tax_template = %(tax)s""", {"item": item, "tax": tax_template})
+		po.cancel()
+		po.delete()
+		new_item_with_tax.delete()
+		frappe.get_doc("Item Tax Template", "Test Update Items Template").delete()
 
 	def test_update_child_uom_conv_factor_change(self):
 		po = create_purchase_order(item_code="_Test FG Item", is_subcontracted="Yes")
diff --git a/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js b/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js
index cf5d7cd..f56c9b4 100644
--- a/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js
+++ b/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js
@@ -22,8 +22,6 @@
 	},
 
 	onload: function(frm) {
-		frm.add_fetch('email_template', 'response', 'message_for_supplier');
-
 		if(!frm.doc.message_for_supplier) {
 			frm.set_value("message_for_supplier", __("Please supply the specified items at the best possible rates"))
 		}
@@ -31,14 +29,12 @@
 
 	refresh: function(frm, cdt, cdn) {
 		if (frm.doc.docstatus === 1) {
-			frm.add_custom_button(__('Create'),
-				function(){ frm.trigger("make_suppplier_quotation") }, __("Supplier Quotation"));
 
-			frm.add_custom_button(__("View"),
-				function(){ frappe.set_route('List', 'Supplier Quotation',
-					{'request_for_quotation': frm.doc.name}) }, __("Supplier Quotation"));
+			frm.add_custom_button(__('Supplier Quotation'),
+				function(){ frm.trigger("make_suppplier_quotation") }, __("Create"));
 
-			frm.add_custom_button(__("Send Supplier Emails"), function() {
+
+			frm.add_custom_button(__("Send Emails to Suppliers"), function() {
 				frappe.call({
 					method: 'erpnext.buying.doctype.request_for_quotation.request_for_quotation.send_supplier_emails',
 					freeze: true,
@@ -49,151 +45,143 @@
 						frm.reload_doc();
 					}
 				});
-			});
+			}, __("Tools"));
+
+			frm.add_custom_button(__('Download PDF'), () => {
+				var suppliers = [];
+				const fields = [{
+					fieldtype: 'Link',
+					label: __('Select a Supplier'),
+					fieldname: 'supplier',
+					options: 'Supplier',
+					reqd: 1,
+					get_query: () => {
+						return {
+							filters: [
+								["Supplier", "name", "in", frm.doc.suppliers.map((row) => {return row.supplier;})]
+							]
+						}
+					}
+				}];
+
+				frappe.prompt(fields, data => {
+					var child = locals[cdt][cdn]
+
+					var w = window.open(
+						frappe.urllib.get_full_url("/api/method/erpnext.buying.doctype.request_for_quotation.request_for_quotation.get_pdf?"
+						+"doctype="+encodeURIComponent(frm.doc.doctype)
+						+"&name="+encodeURIComponent(frm.doc.name)
+						+"&supplier="+encodeURIComponent(data.supplier)
+						+"&no_letterhead=0"));
+					if(!w) {
+						frappe.msgprint(__("Please enable pop-ups")); return;
+					}
+				},
+				'Download PDF for Supplier',
+				'Download');
+			},
+			__("Tools"));
+
+			frm.page.set_inner_btn_group_as_primary(__('Create'));
 		}
 
 	},
 
-	get_suppliers_button: function (frm) {
-		var doc = frm.doc;
-		var dialog = new frappe.ui.Dialog({
-			title: __("Get Suppliers"),
-			fields: [
-				{
-					"fieldtype": "Select", "label": __("Get Suppliers By"),
-					"fieldname": "search_type",
-					"options": ["Tag","Supplier Group"],
-					"reqd": 1,
-					onchange() {
-						if(dialog.get_value('search_type') == 'Tag'){
-							frappe.call({
-								method: 'erpnext.buying.doctype.request_for_quotation.request_for_quotation.get_supplier_tag',
-							}).then(r => {
-								dialog.set_df_property("tag", "options", r.message)
-						});
-						}
-					}
-				},
-				{
-					"fieldtype": "Link", "label": __("Supplier Group"),
-					"fieldname": "supplier_group",
-					"options": "Supplier Group",
-					"reqd": 0,
-					"depends_on": "eval:doc.search_type == 'Supplier Group'"
-				},
-				{
-					"fieldtype": "Select", "label": __("Tag"),
-					"fieldname": "tag",
-					"reqd": 0,
-					"depends_on": "eval:doc.search_type == 'Tag'",
-				},
-				{
-					"fieldtype": "Button", "label": __("Add All Suppliers"),
-					"fieldname": "add_suppliers"
-				},
-			]
-		});
-
-		dialog.fields_dict.add_suppliers.$input.click(function() {
-			var args = dialog.get_values();
-			if(!args) return;
-			dialog.hide();
-
-			//Remove blanks
-			for (var j = 0; j < frm.doc.suppliers.length; j++) {
-				if(!frm.doc.suppliers[j].hasOwnProperty("supplier")) {
-					frm.get_field("suppliers").grid.grid_rows[j].remove();
-				}
-			}
-
-			 function load_suppliers(r) {
-				if(r.message) {
-					for (var i = 0; i < r.message.length; i++) {
-						var exists = false;
-						if (r.message[i].constructor === Array){
-							var supplier = r.message[i][0];
-						} else {
-							var supplier = r.message[i].name;
-						}
-
-						for (var j = 0; j < doc.suppliers.length;j++) {
-							if (supplier === doc.suppliers[j].supplier) {
-								exists = true;
-							}
-						}
-						if(!exists) {
-							var d = frm.add_child('suppliers');
-							d.supplier = supplier;
-							frm.script_manager.trigger("supplier", d.doctype, d.name);
-						}
-					}
-				}
-				frm.refresh_field("suppliers");
-			}
-
-			if (args.search_type === "Tag" && args.tag) {
-				return frappe.call({
-					type: "GET",
-					method: "frappe.desk.doctype.tag.tag.get_tagged_docs",
-					args: {
-						"doctype": "Supplier",
-						"tag": args.tag
-					},
-					callback: load_suppliers
-				});
-			} else if (args.supplier_group) {
-				return frappe.call({
-					method: "frappe.client.get_list",
-					args: {
-						doctype: "Supplier",
-						order_by: "name",
-						fields: ["name"],
-						filters: [["Supplier", "supplier_group", "=", args.supplier_group]]
-
-					},
-					callback: load_suppliers
-				});
-			}
-		});
-		dialog.show();
-
-	},
 	make_suppplier_quotation: function(frm) {
 		var doc = frm.doc;
 		var dialog = new frappe.ui.Dialog({
-			title: __("For Supplier"),
+			title: __("Create Supplier Quotation"),
 			fields: [
 				{	"fieldtype": "Select", "label": __("Supplier"),
 					"fieldname": "supplier",
 					"options": doc.suppliers.map(d => d.supplier),
 					"reqd": 1,
 					"default": doc.suppliers.length === 1 ? doc.suppliers[0].supplier_name : "" },
-				{	"fieldtype": "Button", "label": __('Create Supplier Quotation'),
-					"fieldname": "make_supplier_quotation", "cssClass": "btn-primary" },
+			],
+			primary_action_label: __("Create"),
+			primary_action: (args) => {
+				if(!args) return;
+				dialog.hide();
+
+				return frappe.call({
+					type: "GET",
+					method: "erpnext.buying.doctype.request_for_quotation.request_for_quotation.make_supplier_quotation_from_rfq",
+					args: {
+						"source_name": doc.name,
+						"for_supplier": args.supplier
+					},
+					freeze: true,
+					callback: function(r) {
+						if(!r.exc) {
+							var doc = frappe.model.sync(r.message);
+							frappe.set_route("Form", r.message.doctype, r.message.name);
+						}
+					}
+				});
+			}
+		});
+
+		dialog.show()
+	},
+
+	preview: (frm) => {
+		let dialog = new frappe.ui.Dialog({
+			title: __('Preview Email'),
+			fields: [
+				{
+					label: __('Supplier'),
+					fieldtype: 'Select',
+					fieldname: 'supplier',
+					options: frm.doc.suppliers.map(row => row.supplier),
+					reqd: 1
+				},
+				{
+					fieldtype: 'Column Break',
+					fieldname: 'col_break_1',
+				},
+				{
+					label: __('Subject'),
+					fieldtype: 'Data',
+					fieldname: 'subject',
+					read_only: 1,
+					depends_on: 'subject'
+				},
+				{
+					fieldtype: 'Section Break',
+					fieldname: 'sec_break_1',
+					hide_border: 1
+				},
+				{
+					label: __('Email'),
+					fieldtype: 'HTML',
+					fieldname: 'email_preview'
+				},
+				{
+					fieldtype: 'Section Break',
+					fieldname: 'sec_break_2'
+				},
+				{
+					label: __('Note'),
+					fieldtype: 'HTML',
+					fieldname: 'note'
+				}
 			]
 		});
 
-		dialog.fields_dict.make_supplier_quotation.$input.click(function() {
-			var args = dialog.get_values();
-			if(!args) return;
-			dialog.hide();
-			return frappe.call({
-				type: "GET",
-				method: "erpnext.buying.doctype.request_for_quotation.request_for_quotation.make_supplier_quotation_from_rfq",
-				args: {
-					"source_name": doc.name,
-					"for_supplier": args.supplier
-				},
-				freeze: true,
-				callback: function(r) {
-					if(!r.exc) {
-						var doc = frappe.model.sync(r.message);
-						frappe.set_route("Form", r.message.doctype, r.message.name);
-					}
-				}
+		dialog.fields_dict['supplier'].df.onchange = () => {
+			var supplier = dialog.get_value('supplier');
+			frm.call('get_supplier_email_preview', {supplier: supplier}).then(result => {
+				dialog.fields_dict.email_preview.$wrapper.empty();
+				dialog.fields_dict.email_preview.$wrapper.append(result.message);
 			});
-		});
-		dialog.show()
+
+		}
+
+		dialog.fields_dict.note.$wrapper.append(`<p class="small text-muted">This is a preview of the email to be sent. A PDF of the document will
+			automatically be attached with the email.</p>`);
+
+		dialog.set_value("subject", frm.doc.subject);
+		dialog.show();
 	}
 })
 
@@ -215,42 +203,6 @@
 		})
 	},
 
-	download_pdf: function(frm, cdt, cdn) {
-		var child = locals[cdt][cdn]
-
-		var w = window.open(
-			frappe.urllib.get_full_url("/api/method/erpnext.buying.doctype.request_for_quotation.request_for_quotation.get_pdf?"
-			+"doctype="+encodeURIComponent(frm.doc.doctype)
-			+"&name="+encodeURIComponent(frm.doc.name)
-			+"&supplier_idx="+encodeURIComponent(child.idx)
-			+"&no_letterhead=0"));
-		if(!w) {
-			frappe.msgprint(__("Please enable pop-ups")); return;
-		}
-	},
-	no_quote: function(frm, cdt, cdn) {
-		var d = locals[cdt][cdn];
-		if (d.no_quote) {
-			if (d.quote_status != __('Received')) {
-				frappe.model.set_value(cdt, cdn, 'quote_status', 'No Quote');
-			} else {
-				frappe.msgprint(__("Cannot set a received RFQ to No Quote"));
-				frappe.model.set_value(cdt, cdn, 'no_quote', 0);
-			}
-		} else {
-			d.quote_status = __('Pending');
-			frm.call({
-				method:"update_rfq_supplier_status",
-				doc: frm.doc,
-				args: {
-					sup_name: d.supplier
-				},
-				callback: function(r) {
-					frm.refresh_field("suppliers");
-				}
-			});
-		}
-	}
 })
 
 erpnext.buying.RequestforQuotationController = erpnext.buying.BuyingController.extend({
@@ -274,9 +226,10 @@
 							per_ordered: ["<", 99.99]
 						}
 					})
-				}, __("Get items from"));
+				}, __("Get Items From"));
+
 			// Get items from Opportunity
-            this.frm.add_custom_button(__('Opportunity'),
+			this.frm.add_custom_button(__('Opportunity'),
 				function() {
 					erpnext.utils.map_current_doc({
 						method: "erpnext.crm.doctype.opportunity.opportunity.make_request_for_quotation",
@@ -286,7 +239,8 @@
 							company: me.frm.doc.company
 						},
 					})
-				}, __("Get items from"));
+				}, __("Get Items From"));
+
 			// Get items from open Material Requests based on supplier
 			this.frm.add_custom_button(__('Possible Supplier'), function() {
 				// Create a dialog window for the user to pick their supplier
@@ -324,8 +278,13 @@
 					}
 				}
 				d.show();
-			}, __("Get items from"));
+			}, __("Get Items From"));
 
+			// Get Suppliers
+			this.frm.add_custom_button(__('Get Suppliers'),
+				function() {
+					me.get_suppliers_button(me.frm);
+				});
 		}
 	},
 
@@ -335,9 +294,108 @@
 
 	tc_name: function() {
 		this.get_terms();
-	}
-});
+	},
 
+	get_suppliers_button: function (frm) {
+		var doc = frm.doc;
+		var dialog = new frappe.ui.Dialog({
+			title: __("Get Suppliers"),
+			fields: [
+				{
+					"fieldtype": "Select", "label": __("Get Suppliers By"),
+					"fieldname": "search_type",
+					"options": ["Tag","Supplier Group"],
+					"reqd": 1,
+					onchange() {
+						if(dialog.get_value('search_type') == 'Tag'){
+							frappe.call({
+								method: 'erpnext.buying.doctype.request_for_quotation.request_for_quotation.get_supplier_tag',
+							}).then(r => {
+								dialog.set_df_property("tag", "options", r.message)
+						});
+						}
+					}
+				},
+				{
+					"fieldtype": "Link", "label": __("Supplier Group"),
+					"fieldname": "supplier_group",
+					"options": "Supplier Group",
+					"reqd": 0,
+					"depends_on": "eval:doc.search_type == 'Supplier Group'"
+				},
+				{
+					"fieldtype": "Select", "label": __("Tag"),
+					"fieldname": "tag",
+					"reqd": 0,
+					"depends_on": "eval:doc.search_type == 'Tag'",
+				}
+			],
+			primary_action_label: __("Add Suppliers"),
+			primary_action : (args) => {
+				if(!args) return;
+				dialog.hide();
+
+				//Remove blanks
+				for (var j = 0; j < frm.doc.suppliers.length; j++) {
+					if(!frm.doc.suppliers[j].hasOwnProperty("supplier")) {
+						frm.get_field("suppliers").grid.grid_rows[j].remove();
+					}
+				}
+
+				function load_suppliers(r) {
+					if(r.message) {
+						for (var i = 0; i < r.message.length; i++) {
+							var exists = false;
+							if (r.message[i].constructor === Array){
+								var supplier = r.message[i][0];
+							} else {
+								var supplier = r.message[i].name;
+							}
+
+							for (var j = 0; j < doc.suppliers.length;j++) {
+								if (supplier === doc.suppliers[j].supplier) {
+									exists = true;
+								}
+							}
+							if(!exists) {
+								var d = frm.add_child('suppliers');
+								d.supplier = supplier;
+								frm.script_manager.trigger("supplier", d.doctype, d.name);
+							}
+						}
+					}
+					frm.refresh_field("suppliers");
+				}
+
+				if (args.search_type === "Tag" && args.tag) {
+					return frappe.call({
+						type: "GET",
+						method: "frappe.desk.doctype.tag.tag.get_tagged_docs",
+						args: {
+							"doctype": "Supplier",
+							"tag": args.tag
+						},
+						callback: load_suppliers
+					});
+				} else if (args.supplier_group) {
+					return frappe.call({
+						method: "frappe.client.get_list",
+						args: {
+							doctype: "Supplier",
+							order_by: "name",
+							fields: ["name"],
+							filters: [["Supplier", "supplier_group", "=", args.supplier_group]]
+
+						},
+						callback: load_suppliers
+					});
+				}
+			}
+		});
+
+		dialog.show();
+	},
+});
 
 // for backward compatibility: combine new and previous states
 $.extend(cur_frm.cscript, new erpnext.buying.RequestforQuotationController({frm: cur_frm}));
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 5cd8e6f..4e09a7e 100644
--- a/erpnext/buying/doctype/request_for_quotation/request_for_quotation.json
+++ b/erpnext/buying/doctype/request_for_quotation/request_for_quotation.json
@@ -1,5 +1,5 @@
 {
- "actions": "",
+ "actions": [],
  "allow_import": 1,
  "autoname": "naming_series:",
  "creation": "2016-02-25 01:24:07.224790",
@@ -12,25 +12,27 @@
   "vendor",
   "column_break1",
   "transaction_date",
+  "status",
+  "amended_from",
   "suppliers_section",
   "suppliers",
-  "get_suppliers_button",
   "items_section",
   "items",
   "link_to_mrs",
   "supplier_response_section",
+  "salutation",
   "email_template",
+  "col_break_email_1",
+  "subject",
+  "preview",
+  "sec_break_email_2",
   "message_for_supplier",
   "terms_section_break",
   "tc_name",
   "terms",
   "printing_settings",
   "select_print_heading",
-  "letter_head",
-  "more_info",
-  "status",
-  "column_break3",
-  "amended_from"
+  "letter_head"
  ],
  "fields": [
   {
@@ -78,6 +80,7 @@
    "width": "50%"
   },
   {
+   "default": "Today",
    "fieldname": "transaction_date",
    "fieldtype": "Date",
    "in_list_view": 1,
@@ -94,17 +97,12 @@
   {
    "fieldname": "suppliers",
    "fieldtype": "Table",
-   "label": "Supplier Detail",
+   "label": "Suppliers",
    "options": "Request for Quotation Supplier",
    "print_hide": 1,
    "reqd": 1
   },
   {
-   "fieldname": "get_suppliers_button",
-   "fieldtype": "Button",
-   "label": "Get Suppliers"
-  },
-  {
    "fieldname": "items_section",
    "fieldtype": "Section Break",
    "oldfieldtype": "Section Break",
@@ -126,8 +124,10 @@
    "label": "Link to Material Requests"
   },
   {
+   "depends_on": "eval:!doc.__islocal",
    "fieldname": "supplier_response_section",
-   "fieldtype": "Section Break"
+   "fieldtype": "Section Break",
+   "label": "Email Details"
   },
   {
    "fieldname": "email_template",
@@ -137,6 +137,9 @@
    "print_hide": 1
   },
   {
+   "allow_on_submit": 1,
+   "fetch_from": "email_template.response",
+   "fetch_if_empty": 1,
    "fieldname": "message_for_supplier",
    "fieldtype": "Text Editor",
    "in_list_view": 1,
@@ -198,14 +201,6 @@
    "print_hide": 1
   },
   {
-   "collapsible": 1,
-   "fieldname": "more_info",
-   "fieldtype": "Section Break",
-   "label": "More Information",
-   "oldfieldtype": "Section Break",
-   "options": "fa fa-file-text"
-  },
-  {
    "fieldname": "status",
    "fieldtype": "Select",
    "label": "Status",
@@ -219,10 +214,6 @@
    "search_index": 1
   },
   {
-   "fieldname": "column_break3",
-   "fieldtype": "Column Break"
-  },
-  {
    "fieldname": "amended_from",
    "fieldtype": "Link",
    "label": "Amended From",
@@ -230,12 +221,46 @@
    "options": "Request for Quotation",
    "print_hide": 1,
    "read_only": 1
+  },
+  {
+   "fetch_from": "email_template.subject",
+   "fetch_if_empty": 1,
+   "fieldname": "subject",
+   "fieldtype": "Data",
+   "label": "Subject",
+   "print_hide": 1
+  },
+  {
+   "description": "Select a greeting for the receiver. E.g. Mr., Ms., etc.",
+   "fieldname": "salutation",
+   "fieldtype": "Link",
+   "label": "Salutation",
+   "no_copy": 1,
+   "options": "Salutation",
+   "print_hide": 1
+  },
+  {
+   "fieldname": "col_break_email_1",
+   "fieldtype": "Column Break"
+  },
+  {
+   "depends_on": "eval:!doc.docstatus==1",
+   "fieldname": "preview",
+   "fieldtype": "Button",
+   "label": "Preview Email"
+  },
+  {
+   "depends_on": "eval:!doc.__islocal",
+   "fieldname": "sec_break_email_2",
+   "fieldtype": "Section Break",
+   "hide_border": 1
   }
  ],
  "icon": "fa fa-shopping-cart",
+ "index_web_pages_for_search": 1,
  "is_submittable": 1,
  "links": [],
- "modified": "2020-06-25 14:37:21.140194",
+ "modified": "2020-10-16 17:49:09.561929",
  "modified_by": "Administrator",
  "module": "Buying",
  "name": "Request for Quotation",
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 361ccdf..a51498e 100644
--- a/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py
+++ b/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py
@@ -28,6 +28,10 @@
 		super(RequestforQuotation, self).set_qty_as_per_stock_uom()
 		self.update_email_id()
 
+		if self.docstatus < 1:
+			# after amend and save, status still shows as cancelled, until submit
+			frappe.db.set(self, 'status', 'Draft')
+
 	def validate_duplicate_supplier(self):
 		supplier_list = [d.supplier for d in self.suppliers]
 		if len(supplier_list) != len(set(supplier_list)):
@@ -51,7 +55,7 @@
 
 	def validate_email_id(self, args):
 		if not args.email_id:
-			frappe.throw(_("Row {0}: For Supplier {0}, Email Address is Required to Send Email").format(args.idx, args.supplier))
+			frappe.throw(_("Row {0}: For Supplier {1}, Email Address is Required to send an email").format(args.idx, frappe.bold(args.supplier)))
 
 	def on_submit(self):
 		frappe.db.set(self, 'status', 'Submitted')
@@ -62,43 +66,58 @@
 	def on_cancel(self):
 		frappe.db.set(self, 'status', 'Cancelled')
 
+	def get_supplier_email_preview(self, supplier):
+		"""Returns formatted email preview as string."""
+		rfq_suppliers = list(filter(lambda row: row.supplier == supplier, self.suppliers))
+		rfq_supplier = rfq_suppliers[0]
+
+		self.validate_email_id(rfq_supplier)
+
+		message  = self.supplier_rfq_mail(rfq_supplier, '', self.get_link(), True)
+
+		return message
+
 	def send_to_supplier(self):
+		"""Sends RFQ mail to involved suppliers."""
 		for rfq_supplier in self.suppliers:
 			if rfq_supplier.send_email:
 				self.validate_email_id(rfq_supplier)
 
 				# make new user if required
-				update_password_link = self.update_supplier_contact(rfq_supplier, self.get_link())
+				update_password_link, contact = self.update_supplier_contact(rfq_supplier, self.get_link())
 
-				self.update_supplier_part_no(rfq_supplier)
+				self.update_supplier_part_no(rfq_supplier.supplier)
 				self.supplier_rfq_mail(rfq_supplier, update_password_link, self.get_link())
 				rfq_supplier.email_sent = 1
+				if not rfq_supplier.contact:
+					rfq_supplier.contact = contact
 				rfq_supplier.save()
 
 	def get_link(self):
 		# RFQ link for supplier portal
 		return get_url("/rfq/" + self.name)
 
-	def update_supplier_part_no(self, args):
-		self.vendor = args.supplier
+	def update_supplier_part_no(self, supplier):
+		self.vendor = supplier
 		for item in self.items:
 			item.supplier_part_no = frappe.db.get_value('Item Supplier',
-				{'parent': item.item_code, 'supplier': args.supplier}, 'supplier_part_no')
+				{'parent': item.item_code, 'supplier': supplier}, 'supplier_part_no')
 
 	def update_supplier_contact(self, rfq_supplier, link):
 		'''Create a new user for the supplier if not set in contact'''
-		update_password_link = ''
+		update_password_link, contact = '', ''
 
 		if frappe.db.exists("User", rfq_supplier.email_id):
 			user = frappe.get_doc("User", rfq_supplier.email_id)
 		else:
 			user, update_password_link = self.create_user(rfq_supplier, link)
 
-		self.update_contact_of_supplier(rfq_supplier, user)
+		contact = self.link_supplier_contact(rfq_supplier, user)
 
-		return update_password_link
+		return update_password_link, contact
 
-	def update_contact_of_supplier(self, rfq_supplier, user):
+	def link_supplier_contact(self, rfq_supplier, user):
+		"""If no Contact, create a new contact against Supplier. If Contact exists, check if email and user id set."""
 		if rfq_supplier.contact:
 			contact = frappe.get_doc("Contact", rfq_supplier.contact)
 		else:
@@ -115,6 +134,10 @@
 
 		contact.save(ignore_permissions=True)
 
+		if not rfq_supplier.contact:
+			# return contact to later update, RFQ supplier row's contact
+			return contact.name
+
 	def create_user(self, rfq_supplier, link):
 		user = frappe.get_doc({
 			'doctype': 'User',
@@ -129,22 +152,36 @@
 
 		return user, update_password_link
 
-	def supplier_rfq_mail(self, data, update_password_link, rfq_link):
+	def supplier_rfq_mail(self, data, update_password_link, rfq_link, preview=False):
 		full_name = get_user_fullname(frappe.session['user'])
 		if full_name == "Guest":
 			full_name = "Administrator"
 
+		# send document dict and some important data from suppliers row
+		# to render message_for_supplier from any template
+		doc_args = self.as_dict()
+		doc_args.update({
+			'supplier': data.get('supplier'),
+			'supplier_name': data.get('supplier_name')
+		})
+
 		args = {
 			'update_password_link': update_password_link,
-			'message': frappe.render_template(self.message_for_supplier, data.as_dict()),
+			'message': frappe.render_template(self.message_for_supplier, doc_args),
 			'rfq_link': rfq_link,
-			'user_fullname': full_name
+			'user_fullname': full_name,
+			'supplier_name' : data.get('supplier_name'),
+			'supplier_salutation' : self.salutation or 'Dear Mx.',
 		}
 
-		subject = _("Request for Quotation")
+		subject = self.subject or _("Request for Quotation")
 		template = "templates/emails/request_for_quotation.html"
 		sender = frappe.session.user not in STANDARD_USERS and frappe.session.user or None
 		message = frappe.get_template(template).render(args)
+
+		if preview:
+			return message
+
 		attachments = self.get_attachments()
 
 		self.send_email(data, sender, subject, message, attachments)
@@ -164,23 +201,22 @@
 	def update_rfq_supplier_status(self, sup_name=None):
 		for supplier in self.suppliers:
 			if sup_name == None or supplier.supplier == sup_name:
-				if supplier.quote_status != _('No Quote'):
-					quote_status = _('Received')
-					for item in self.items:
-						sqi_count = frappe.db.sql("""
-							SELECT
-								COUNT(sqi.name) as count
-							FROM
-								`tabSupplier Quotation Item` as sqi,
-								`tabSupplier Quotation` as sq
-							WHERE sq.supplier = %(supplier)s
-								AND sqi.docstatus = 1
-								AND sqi.request_for_quotation_item = %(rqi)s
-								AND sqi.parent = sq.name""",
-							{"supplier": supplier.supplier, "rqi": item.name}, as_dict=1)[0]
-						if (sqi_count.count) == 0:
-							quote_status = _('Pending')
-					supplier.quote_status = quote_status
+				quote_status = _('Received')
+				for item in self.items:
+					sqi_count = frappe.db.sql("""
+						SELECT
+							COUNT(sqi.name) as count
+						FROM
+							`tabSupplier Quotation Item` as sqi,
+							`tabSupplier Quotation` as sq
+						WHERE sq.supplier = %(supplier)s
+							AND sqi.docstatus = 1
+							AND sqi.request_for_quotation_item = %(rqi)s
+							AND sqi.parent = sq.name""",
+						{"supplier": supplier.supplier, "rqi": item.name}, as_dict=1)[0]
+					if (sqi_count.count) == 0:
+						quote_status = _('Pending')
+				supplier.quote_status = quote_status
 
 
 @frappe.whitelist()
@@ -289,16 +325,15 @@
 	})
 
 @frappe.whitelist()
-def get_pdf(doctype, name, supplier_idx):
-	doc = get_rfq_doc(doctype, name, supplier_idx)
+def get_pdf(doctype, name, supplier):
+	doc = get_rfq_doc(doctype, name, supplier)
 	if doc:
 		download_pdf(doctype, name, doc=doc)
 
-def get_rfq_doc(doctype, name, supplier_idx):
-	if cint(supplier_idx):
+def get_rfq_doc(doctype, name, supplier):
+	if supplier:
 		doc = frappe.get_doc(doctype, name)
-		args = doc.get('suppliers')[cint(supplier_idx) - 1]
-		doc.update_supplier_part_no(args)
+		doc.update_supplier_part_no(supplier)
 		return doc
 
 @frappe.whitelist()
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 ea38129..36f87b0 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
@@ -25,14 +25,10 @@
 		sq = make_supplier_quotation_from_rfq(rfq.name, for_supplier=rfq.get('suppliers')[0].supplier)
 		sq.submit()
 
-		# No Quote first supplier quotation
-		rfq.get('suppliers')[1].no_quote = 1
-		rfq.get('suppliers')[1].quote_status = 'No Quote'
-
 		rfq.update_rfq_supplier_status() #rfq.get('suppliers')[1].supplier)
 
 		self.assertEqual(rfq.get('suppliers')[0].quote_status, 'Received')
-		self.assertEqual(rfq.get('suppliers')[1].quote_status, 'No Quote')
+		self.assertEqual(rfq.get('suppliers')[1].quote_status, 'Pending')
 
 	def test_make_supplier_quotation(self):
 		rfq = make_request_for_quotation()
diff --git a/erpnext/buying/doctype/request_for_quotation/tests/test_request_for_quotation_for_status.js b/erpnext/buying/doctype/request_for_quotation/tests/test_request_for_quotation_for_status.js
index 1a9cd35..2e1652d 100644
--- a/erpnext/buying/doctype/request_for_quotation/tests/test_request_for_quotation_for_status.js
+++ b/erpnext/buying/doctype/request_for_quotation/tests/test_request_for_quotation_for_status.js
@@ -84,9 +84,6 @@
 			cur_frm.fields_dict.suppliers.grid.grid_rows[0].toggle_view();
 		},
 		() => frappe.timeout(1),
-		() => {
-			frappe.click_check('No Quote');
-		},
 		() => frappe.timeout(1),
 		() => {
 			cur_frm.cur_grid.toggle_view();
@@ -125,7 +122,6 @@
 		() => frappe.timeout(1),
 		() => {
 			assert.ok(cur_frm.fields_dict.suppliers.grid.grid_rows[1].doc.quote_status == "Received");
-			assert.ok(cur_frm.fields_dict.suppliers.grid.grid_rows[0].doc.no_quote == 1);
 		},
 		() => done()
 	]);
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 408f49f..e07f462 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
@@ -27,10 +27,11 @@
   "stock_qty",
   "warehouse_and_reference",
   "warehouse",
-  "project_name",
   "col_break4",
   "material_request",
   "material_request_item",
+  "section_break_24",
+  "project_name",
   "section_break_23",
   "page_break"
  ],
@@ -161,7 +162,7 @@
   {
    "fieldname": "project_name",
    "fieldtype": "Link",
-   "label": "Project Name",
+   "label": "Project",
    "options": "Project",
    "print_hide": 1
   },
@@ -249,11 +250,18 @@
    "no_copy": 1,
    "print_hide": 1,
    "read_only": 1
+  },
+  {
+   "collapsible": 1,
+   "fieldname": "section_break_24",
+   "fieldtype": "Section Break",
+   "label": "Accounting Dimensions"
   }
  ],
+ "index_web_pages_for_search": 1,
  "istable": 1,
  "links": [],
- "modified": "2020-06-12 19:10:36.333441",
+ "modified": "2020-09-24 17:26:46.276934",
  "modified_by": "Administrator",
  "module": "Buying",
  "name": "Request for Quotation Item",
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 61ad336..96d7e2d 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
@@ -1,362 +1,99 @@
 {
- "allow_copy": 0, 
- "allow_guest_to_view": 0, 
- "allow_import": 0, 
- "allow_rename": 0, 
- "beta": 0, 
- "creation": "2016-03-29 05:59:11.896885", 
- "custom": 0, 
- "docstatus": 0, 
- "doctype": "DocType", 
- "document_type": "", 
- "editable_grid": 1, 
- "engine": "InnoDB", 
+ "actions": [],
+ "creation": "2016-03-29 05:59:11.896885",
+ "doctype": "DocType",
+ "editable_grid": 1,
+ "engine": "InnoDB",
+ "field_order": [
+  "send_email",
+  "email_sent",
+  "supplier",
+  "contact",
+  "quote_status",
+  "column_break_3",
+  "supplier_name",
+  "email_id"
+ ],
  "fields": [
   {
-   "allow_bulk_edit": 0, 
-   "allow_on_submit": 1, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "default": "1", 
-   "fieldname": "send_email", 
-   "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 Email", 
-   "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_on_submit": 1,
+   "columns": 2,
+   "default": "1",
+   "fieldname": "send_email",
+   "fieldtype": "Check",
+   "in_list_view": 1,
+   "label": "Send Email"
+  },
   {
-   "allow_bulk_edit": 0, 
-   "allow_on_submit": 1, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "default": "0", 
-   "depends_on": "eval:doc.docstatus >= 1", 
-   "fieldname": "email_sent", 
-   "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": "Email Sent", 
-   "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
-  }, 
+   "allow_on_submit": 1,
+   "default": "0",
+   "depends_on": "eval:doc.docstatus >= 1",
+   "fieldname": "email_sent",
+   "fieldtype": "Check",
+   "label": "Email Sent",
+   "no_copy": 1,
+   "read_only": 1
+  },
   {
-   "allow_bulk_edit": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 4, 
-   "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
-  }, 
+   "columns": 2,
+   "fieldname": "supplier",
+   "fieldtype": "Link",
+   "in_list_view": 1,
+   "label": "Supplier",
+   "options": "Supplier",
+   "reqd": 1
+  },
   {
-   "allow_bulk_edit": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 3, 
-   "fieldname": "contact", 
-   "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": "Contact", 
-   "length": 0, 
-   "no_copy": 1, 
-   "options": "Contact", 
-   "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,
+   "columns": 2,
+   "fieldname": "contact",
+   "fieldtype": "Link",
+   "in_list_view": 1,
+   "label": "Contact",
+   "no_copy": 1,
+   "options": "Contact"
+  },
   {
-   "allow_bulk_edit": 0, 
-   "allow_on_submit": 1, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "depends_on": "eval:doc.docstatus >= 1 && doc.quote_status != 'Received'", 
-   "fieldname": "no_quote", 
-   "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": "No Quote", 
-   "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_on_submit": 1,
+   "depends_on": "eval:doc.docstatus >= 1",
+   "fieldname": "quote_status",
+   "fieldtype": "Select",
+   "label": "Quote Status",
+   "options": "Pending\nReceived",
+   "read_only": 1
+  },
   {
-   "allow_bulk_edit": 0, 
-   "allow_on_submit": 1, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "depends_on": "eval:doc.docstatus >= 1 && !doc.no_quote", 
-   "fieldname": "quote_status", 
-   "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": "Quote Status", 
-   "length": 0, 
-   "no_copy": 0, 
-   "options": "Pending\nReceived\nNo Quote", 
-   "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": "column_break_3",
+   "fieldtype": "Column Break"
+  },
   {
-   "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, 
-   "translatable": 0,
-   "unique": 0
-  }, 
-  {
-   "allow_bulk_edit": 0, 
-   "allow_on_submit": 0, 
-   "bold": 1, 
-   "collapsible": 0, 
-   "columns": 0, 
+   "bold": 1,
    "fetch_from": "supplier.supplier_name",
-   "fieldname": "supplier_name", 
-   "fieldtype": "Read Only", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_global_search": 1, 
-   "in_list_view": 0, 
-   "in_standard_filter": 0, 
-   "label": "Supplier 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": "supplier_name",
+   "fieldtype": "Read Only",
+   "in_global_search": 1,
+   "label": "Supplier Name"
+  },
   {
-   "allow_bulk_edit": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 3, 
+   "columns": 3,
    "fetch_from": "contact.email_id",
-   "fieldname": "email_id", 
-   "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": "Email Id", 
-   "length": 0, 
-   "no_copy": 1, 
-   "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
-  }, 
-  {
-   "allow_bulk_edit": 0, 
-   "allow_on_submit": 1, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "fieldname": "download_pdf", 
-   "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": "Download PDF", 
-   "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": "email_id",
+   "fieldtype": "Data",
+   "in_list_view": 1,
+   "label": "Email Id",
+   "no_copy": 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:30.212408",
- "modified_by": "Administrator", 
- "module": "Buying", 
- "name": "Request for Quotation Supplier", 
- "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
+ ],
+ "index_web_pages_for_search": 1,
+ "istable": 1,
+ "links": [],
+ "modified": "2020-10-16 12:23:41.769820",
+ "modified_by": "Administrator",
+ "module": "Buying",
+ "name": "Request for Quotation Supplier",
+ "owner": "Administrator",
+ "permissions": [],
+ "sort_field": "modified",
+ "sort_order": "DESC",
+ "track_changes": 1
 }
\ No newline at end of file
diff --git a/erpnext/buying/doctype/supplier_quotation/supplier_quotation.py b/erpnext/buying/doctype/supplier_quotation/supplier_quotation.py
index baf2457..ae5611f 100644
--- a/erpnext/buying/doctype/supplier_quotation/supplier_quotation.py
+++ b/erpnext/buying/doctype/supplier_quotation/supplier_quotation.py
@@ -91,12 +91,7 @@
 					for my_item in self.items) if include_me else 0
 				if (sqi_count.count + self_count) == 0:
 					quote_status = _('Pending')
-			if quote_status == _('Received') and doc_sup.quote_status == _('No Quote'):
-				frappe.msgprint(_("{0} indicates that {1} will not provide a quotation, but all items \
-					have been quoted. Updating the RFQ quote status.").format(doc.name, self.supplier))
-				frappe.db.set_value('Request for Quotation Supplier', doc_sup.name, 'quote_status', quote_status)
-				frappe.db.set_value('Request for Quotation Supplier', doc_sup.name, 'no_quote', 0)
-			elif doc_sup.quote_status != _('No Quote'):
+
 				frappe.db.set_value('Request for Quotation Supplier', doc_sup.name, 'quote_status', quote_status)
 
 def get_list_context(context=None):
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 7d62435..638cde0 100644
--- a/erpnext/buying/doctype/supplier_quotation_item/supplier_quotation_item.json
+++ b/erpnext/buying/doctype/supplier_quotation_item/supplier_quotation_item.json
@@ -241,7 +241,7 @@
    "fieldname": "rate",
    "fieldtype": "Currency",
    "in_list_view": 1,
-   "label": "Rate ",
+   "label": "Rate",
    "oldfieldname": "import_rate",
    "oldfieldtype": "Currency",
    "options": "currency"
@@ -560,7 +560,7 @@
  "index_web_pages_for_search": 1,
  "istable": 1,
  "links": [],
- "modified": "2020-10-01 16:34:39.703033",
+ "modified": "2020-10-19 12:36:26.913211",
  "modified_by": "Administrator",
  "module": "Buying",
  "name": "Supplier Quotation Item",
diff --git a/erpnext/buying/report/procurement_tracker/procurement_tracker.py b/erpnext/buying/report/procurement_tracker/procurement_tracker.py
index 88a865f..beeca09 100644
--- a/erpnext/buying/report/procurement_tracker/procurement_tracker.py
+++ b/erpnext/buying/report/procurement_tracker/procurement_tracker.py
@@ -143,7 +143,7 @@
 	conditions = ""
 
 	if filters.get("company"):
-		conditions += " AND par.company=%s" % frappe.db.escape(filters.get('company'))
+		conditions += " AND parent.company=%s" % frappe.db.escape(filters.get('company'))
 
 	if filters.get("cost_center") or filters.get("project"):
 		conditions += """
@@ -151,10 +151,10 @@
 			""" % (frappe.db.escape(filters.get('cost_center')), frappe.db.escape(filters.get('project')))
 
 	if filters.get("from_date"):
-		conditions += " AND par.transaction_date>='%s'" % filters.get('from_date')
+		conditions += " AND parent.transaction_date>='%s'" % filters.get('from_date')
 
 	if filters.get("to_date"):
-		conditions += " AND par.transaction_date<='%s'" % filters.get('to_date')
+		conditions += " AND parent.transaction_date<='%s'" % filters.get('to_date')
 	return conditions
 
 def get_data(filters):
@@ -198,21 +198,23 @@
 	mr_records = {}
 	mr_details = frappe.db.sql("""
 		SELECT
-			par.transaction_date,
-			par.per_ordered,
-			par.owner,
+			parent.transaction_date,
+			parent.per_ordered,
+			parent.owner,
 			child.name,
 			child.parent,
 			child.amount,
 			child.qty,
 			child.item_code,
 			child.uom,
-			par.status
-		FROM `tabMaterial Request` par, `tabMaterial Request Item` child
+			parent.status,
+			child.project,
+			child.cost_center
+		FROM `tabMaterial Request` parent, `tabMaterial Request Item` child
 		WHERE
-			par.per_ordered>=0
-			AND par.name=child.parent
-			AND par.docstatus=1
+			parent.per_ordered>=0
+			AND parent.name=child.parent
+			AND parent.docstatus=1
 			{conditions}
 		""".format(conditions=conditions), as_dict=1) #nosec
 
@@ -232,7 +234,9 @@
 				status=record.status,
 				actual_cost=0,
 				purchase_order_amt=0,
-				purchase_order_amt_in_company_currency=0
+				purchase_order_amt_in_company_currency=0,
+				project = record.project,
+				cost_center = record.cost_center
 			)
 			procurement_record_against_mr.append(procurement_record_details)
 	return mr_records, procurement_record_against_mr
@@ -280,16 +284,16 @@
 			child.amount,
 			child.base_amount,
 			child.schedule_date,
-			par.transaction_date,
-			par.supplier,
-			par.status,
-			par.owner
-		FROM `tabPurchase Order` par, `tabPurchase Order Item` child
+			parent.transaction_date,
+			parent.supplier,
+			parent.status,
+			parent.owner
+		FROM `tabPurchase Order` parent, `tabPurchase Order Item` child
 		WHERE
-			par.docstatus = 1
-			AND par.name = child.parent
-			AND par.status not in  ("Closed","Completed","Cancelled")
+			parent.docstatus = 1
+			AND parent.name = child.parent
+			AND parent.status not in  ("Closed","Completed","Cancelled")
 			{conditions}
 		GROUP BY
-			par.name, child.item_code
+			parent.name, child.item_code
 		""".format(conditions=conditions), as_dict=1) #nosec
\ No newline at end of file
diff --git a/erpnext/communication/doctype/call_log/call_log.py b/erpnext/communication/doctype/call_log/call_log.py
index b31b757..296473e 100644
--- a/erpnext/communication/doctype/call_log/call_log.py
+++ b/erpnext/communication/doctype/call_log/call_log.py
@@ -15,9 +15,9 @@
 		number = strip_number(self.get('from'))
 		self.contact = get_contact_with_phone_number(number)
 		self.lead = get_lead_with_phone_number(number)
-
-		contact = frappe.get_doc("Contact", self.contact)
-		self.customer = contact.get_link_for("Customer")
+		if self.contact:
+			contact = frappe.get_doc("Contact", self.contact)
+			self.customer = contact.get_link_for("Customer")
 
 	def after_insert(self):
 		self.trigger_call_popup()
diff --git a/erpnext/config/getting_started.py b/erpnext/config/getting_started.py
index fa84b1c..dc72316 100644
--- a/erpnext/config/getting_started.py
+++ b/erpnext/config/getting_started.py
@@ -63,8 +63,8 @@
 				{
 					"type": "doctype",
 					"name": "Chart of Accounts Importer",
-					"labe": _("Chart Of Accounts Importer"),
-					"description": _("Import Chart Of Accounts from CSV / Excel files"),
+					"label": _("Chart of Accounts Importer"),
+					"description": _("Import Chart of Accounts from CSV / Excel files"),
 					"onboard": 1
 				},
 				{
diff --git a/erpnext/controllers/accounts_controller.py b/erpnext/controllers/accounts_controller.py
index 1665649..fc32977 100644
--- a/erpnext/controllers/accounts_controller.py
+++ b/erpnext/controllers/accounts_controller.py
@@ -605,8 +605,6 @@
 		from erpnext.accounts.utils import unlink_ref_doc_from_payment_entries
 
 		if self.doctype in ["Sales Invoice", "Purchase Invoice"]:
-			if self.is_return: return
-
 			if frappe.db.get_single_value('Accounts Settings', 'unlink_payment_on_cancellation_of_invoice'):
 				unlink_ref_doc_from_payment_entries(self)
 
@@ -1170,6 +1168,31 @@
 	if child_item.get("item_tax_template"):
 		child_item.item_tax_rate = get_item_tax_map(parent_doc.get('company'), child_item.item_tax_template, as_json=True)
 
+def add_taxes_from_tax_template(child_item, parent_doc):
+	add_taxes_from_item_tax_template = frappe.db.get_single_value("Accounts Settings", "add_taxes_from_item_tax_template")
+
+	if child_item.get("item_tax_rate") and add_taxes_from_item_tax_template:
+		tax_map = json.loads(child_item.get("item_tax_rate"))
+		for tax_type in tax_map:
+			tax_rate = flt(tax_map[tax_type])
+			taxes = parent_doc.get('taxes') or []
+			# add new row for tax head only if missing
+			found = any(tax.account_head == tax_type for tax in taxes)
+			if not found:
+				tax_row = parent_doc.append("taxes", {})
+				tax_row.update({
+					"description" : str(tax_type).split(' - ')[0],
+					"charge_type" : "On Net Total",
+					"account_head" : tax_type,
+					"rate" : tax_rate
+				})
+				if parent_doc.doctype == "Purchase Order":
+					tax_row.update({
+						"category" : "Total",
+						"add_deduct_tax" : "Add"
+					})
+				tax_row.db_insert()
+
 def set_sales_order_defaults(parent_doctype, parent_doctype_name, child_docname, trans_item):
 	"""
 	Returns a Sales Order Item child item containing the default values
@@ -1185,6 +1208,7 @@
 	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
 	set_child_tax_template_and_map(item, child_item, p_doc)
+	add_taxes_from_tax_template(child_item, p_doc)
 	child_item.warehouse = get_item_warehouse(item, p_doc, overwrite_warehouse=True)
 	if not child_item.warehouse:
 		frappe.throw(_("Cannot find {} for item {}. Please set the same in Item Master or Stock Settings.")
@@ -1209,6 +1233,7 @@
 	child_item.base_rate = 1 # Initiallize value will update in parent validation
 	child_item.base_amount = 1 # Initiallize value will update in parent validation
 	set_child_tax_template_and_map(item, child_item, p_doc)
+	add_taxes_from_tax_template(child_item, p_doc)
 	return child_item
 
 def validate_and_delete_children(parent, data):
diff --git a/erpnext/controllers/stock_controller.py b/erpnext/controllers/stock_controller.py
index 394883d..f743d70 100644
--- a/erpnext/controllers/stock_controller.py
+++ b/erpnext/controllers/stock_controller.py
@@ -52,7 +52,7 @@
 						frappe.throw(_("Row #{0}: Serial No {1} does not belong to Batch {2}")
 							.format(d.idx, serial_no_data.name, d.batch_no))
 
-			if d.qty > 0 and d.get("batch_no") and self.get("posting_date") and self.docstatus < 2:
+			if flt(d.qty) > 0.0 and d.get("batch_no") and self.get("posting_date") and self.docstatus < 2:
 				expiry_date = frappe.get_cached_value("Batch", d.get("batch_no"), "expiry_date")
 
 				if expiry_date and getdate(expiry_date) < getdate(self.posting_date):
diff --git a/erpnext/crm/doctype/lead/lead.json b/erpnext/crm/doctype/lead/lead.json
index f5f8b4e..2df1793 100644
--- a/erpnext/crm/doctype/lead/lead.json
+++ b/erpnext/crm/doctype/lead/lead.json
@@ -241,6 +241,7 @@
   },
   {
    "depends_on": "eval: doc.__islocal",
+   "description": "Home, Work, etc.",
    "fieldname": "address_title",
    "fieldtype": "Data",
    "label": "Address Title"
@@ -249,7 +250,8 @@
    "depends_on": "eval: doc.__islocal",
    "fieldname": "address_line1",
    "fieldtype": "Data",
-   "label": "Address Line 1"
+   "label": "Address Line 1",
+   "mandatory_depends_on": "eval: doc.address_title && doc.address_type"
   },
   {
    "depends_on": "eval: doc.__islocal",
@@ -261,7 +263,8 @@
    "depends_on": "eval: doc.__islocal",
    "fieldname": "city",
    "fieldtype": "Data",
-   "label": "City/Town"
+   "label": "City/Town",
+   "mandatory_depends_on": "eval: doc.address_title && doc.address_type"
   },
   {
    "depends_on": "eval: doc.__islocal",
@@ -280,6 +283,7 @@
    "fieldname": "country",
    "fieldtype": "Link",
    "label": "Country",
+   "mandatory_depends_on": "eval: doc.address_title && doc.address_type",
    "options": "Country"
   },
   {
@@ -449,7 +453,7 @@
  "idx": 5,
  "image_field": "image",
  "links": [],
- "modified": "2020-06-18 14:39:41.835416",
+ "modified": "2020-10-13 15:24:00.094811",
  "modified_by": "Administrator",
  "module": "CRM",
  "name": "Lead",
diff --git a/erpnext/crm/doctype/lead/lead.py b/erpnext/crm/doctype/lead/lead.py
index 99fa703..1439adb 100644
--- a/erpnext/crm/doctype/lead/lead.py
+++ b/erpnext/crm/doctype/lead/lead.py
@@ -22,7 +22,8 @@
 		load_address_and_contact(self)
 
 	def before_insert(self):
-		self.address_doc = self.create_address()
+		if self.address_title and self.address_type:
+			self.address_doc = self.create_address()
 		self.contact_doc = self.create_contact()
 
 	def after_insert(self):
@@ -133,15 +134,6 @@
 		# skipping country since the system auto-sets it from system defaults
 		address = frappe.new_doc("Address")
 
-		mandatory_fields = [ df.fieldname for df in address.meta.fields if df.reqd ]
-
-		if not all([self.get(field) for field in mandatory_fields]):
-			frappe.msgprint(_('Missing mandatory fields in address. \
-				{0} to create address' ).format("<a href='desk#Form/Address/New Address 1' \
-				> Click here </a>"),
-				alert=True, indicator='yellow')
-			return
-
 		address.update({addr_field: self.get(addr_field) for addr_field in address_fields})
 		address.update({info_field: self.get(info_field) for info_field in info_fields})
 		address.insert()
@@ -190,7 +182,7 @@
 
 	def update_links(self):
 		# update address links
-		if self.address_doc:
+		if hasattr(self, 'address_doc'):
 			self.address_doc.append("links", {
 				"link_doctype": "Lead",
 				"link_name": self.name,
diff --git a/erpnext/domains/healthcare.py b/erpnext/domains/healthcare.py
index 8bd4c76..bbeb2c6 100644
--- a/erpnext/domains/healthcare.py
+++ b/erpnext/domains/healthcare.py
@@ -49,6 +49,22 @@
 				'fieldname': 'reference_dn', 'label': 'Reference Name', 'fieldtype': 'Dynamic Link', 'options': 'reference_dt',
 				'insert_after': 'reference_dt'
 			}
+		],
+		'Stock Entry': [
+			{
+				'fieldname': 'inpatient_medication_entry', 'label': 'Inpatient Medication Entry', 'fieldtype': 'Link', 'options': 'Inpatient Medication Entry',
+				'insert_after': 'credit_note', 'read_only': True
+			}
+		],
+		'Stock Entry Detail': [
+			{
+				'fieldname': 'patient', 'label': 'Patient', 'fieldtype': 'Link', 'options': 'Patient',
+				'insert_after': 'po_detail', 'read_only': True
+			},
+			{
+				'fieldname': 'inpatient_medication_entry_child', 'label': 'Inpatient Medication Entry Child', 'fieldtype': 'Data',
+				'insert_after': 'patient', 'read_only': True
+			}
 		]
 	},
 	'on_setup': 'erpnext.healthcare.setup.setup_healthcare'
diff --git a/erpnext/education/api.py b/erpnext/education/api.py
index bf9f221..948e7cc 100644
--- a/erpnext/education/api.py
+++ b/erpnext/education/api.py
@@ -7,7 +7,7 @@
 import json
 from frappe import _
 from frappe.model.mapper import get_mapped_doc
-from frappe.utils import flt, cstr
+from frappe.utils import flt, cstr, getdate
 from frappe.email.doctype.email_group.email_group import add_subscribers
 
 def get_course(program):
@@ -67,6 +67,13 @@
 	:param date: Date.
 	"""
 
+	if student_group:
+		academic_year = frappe.db.get_value('Student Group', student_group, 'academic_year')
+		if academic_year:
+			year_start_date, year_end_date = frappe.db.get_value('Academic Year', academic_year, ['year_start_date', 'year_end_date'])
+			if getdate(date) < getdate(year_start_date) or getdate(date) > getdate(year_end_date):
+				frappe.throw(_('Attendance cannot be marked outside of Academic Year {0}').format(academic_year))
+
 	present = json.loads(students_present)
 	absent = json.loads(students_absent)
 
diff --git a/erpnext/education/doctype/assessment_plan/assessment_plan.js b/erpnext/education/doctype/assessment_plan/assessment_plan.js
index c4c5614..726c0fc 100644
--- a/erpnext/education/doctype/assessment_plan/assessment_plan.js
+++ b/erpnext/education/doctype/assessment_plan/assessment_plan.js
@@ -30,6 +30,23 @@
 				frappe.set_route('Form', 'Assessment Result Tool');
 			}, __('Tools'));
 		}
+
+		frm.set_query('course', function() {
+			return {
+				query: 'erpnext.education.doctype.program_enrollment.program_enrollment.get_program_courses',
+				filters: {
+					'program': frm.doc.program
+				}
+			};
+		});
+
+		frm.set_query('academic_term', function() {
+			return {
+				filters: {
+					'academic_year': frm.doc.academic_year
+				}
+			};
+		});
 	},
 
 	course: function(frm) {
diff --git a/erpnext/education/doctype/assessment_plan/assessment_plan.json b/erpnext/education/doctype/assessment_plan/assessment_plan.json
index 95ed853..5066fdf 100644
--- a/erpnext/education/doctype/assessment_plan/assessment_plan.json
+++ b/erpnext/education/doctype/assessment_plan/assessment_plan.json
@@ -12,8 +12,8 @@
   "assessment_group",
   "grading_scale",
   "column_break_2",
-  "course",
   "program",
+  "course",
   "academic_year",
   "academic_term",
   "section_break_5",
@@ -198,7 +198,7 @@
  ],
  "is_submittable": 1,
  "links": [],
- "modified": "2020-05-09 14:56:26.746988",
+ "modified": "2020-10-23 15:55:35.076251",
  "modified_by": "Administrator",
  "module": "Education",
  "name": "Assessment Plan",
diff --git a/erpnext/education/doctype/assessment_result/assessment_result.js b/erpnext/education/doctype/assessment_result/assessment_result.js
index 63d1aee..617a873 100644
--- a/erpnext/education/doctype/assessment_result/assessment_result.js
+++ b/erpnext/education/doctype/assessment_result/assessment_result.js
@@ -7,6 +7,23 @@
 			frm.trigger('setup_chart');
 		}
 		frm.set_df_property('details', 'read_only', 1);
+
+		frm.set_query('course', function() {
+			return {
+				query: 'erpnext.education.doctype.program_enrollment.program_enrollment.get_program_courses',
+				filters: {
+					'program': frm.doc.program
+				}
+			};
+		});
+
+		frm.set_query('academic_term', function() {
+			return {
+				filters: {
+					'academic_year': frm.doc.academic_year
+				}
+			};
+		});
 	},
 
 	onload: function(frm) {
diff --git a/erpnext/education/doctype/course_enrollment/course_enrollment.py b/erpnext/education/doctype/course_enrollment/course_enrollment.py
index b082be2..f7aa6e9 100644
--- a/erpnext/education/doctype/course_enrollment/course_enrollment.py
+++ b/erpnext/education/doctype/course_enrollment/course_enrollment.py
@@ -6,9 +6,13 @@
 import frappe
 from frappe import _
 from frappe.model.document import Document
+from frappe.utils import get_link_to_form
 from functools import reduce
 
 class CourseEnrollment(Document):
+	def validate(self):
+		self.validate_duplication()
+
 	def get_progress(self, student):
 		"""
 		Returns Progress of given student for a particular course enrollment
@@ -27,13 +31,15 @@
 			return []
 
 	def validate_duplication(self):
-		enrollment = frappe.get_all("Course Enrollment", filters={
+		enrollment = frappe.db.exists("Course Enrollment", {
 			"student": self.student,
 			"course": self.course,
-			"program_enrollment": self.program_enrollment
+			"program_enrollment": self.program_enrollment,
+			"name": ("!=", self.name)
 		})
 		if enrollment:
-			frappe.throw(_("Student is already enrolled."))
+			frappe.throw(_("Student is already enrolled via Course Enrollment {0}").format(
+				get_link_to_form("Course Enrollment", enrollment)), title=_('Duplicate Entry'))
 
 	def add_quiz_activity(self, quiz_name, quiz_response, answers, score, status):
 		result = {k: ('Correct' if v else 'Wrong') for k,v in answers.items()}
diff --git a/erpnext/education/doctype/course_enrollment/test_course_enrollment.py b/erpnext/education/doctype/course_enrollment/test_course_enrollment.py
index 5ecace2..e22c7ce 100644
--- a/erpnext/education/doctype/course_enrollment/test_course_enrollment.py
+++ b/erpnext/education/doctype/course_enrollment/test_course_enrollment.py
@@ -17,8 +17,9 @@
 		setup_program()
 		student = create_student({"first_name": "_Test First", "last_name": "_Test Last", "email": "_test_student_1@example.com"})
 		program_enrollment = student.enroll_in_program("_Test Program")
-		course_enrollment = student.enroll_in_course("_Test Course 1", program_enrollment.name)
-		make_course_activity(course_enrollment.name, "Article", "_Test Article 1-1")
+		course_enrollment = frappe.db.get_value("Course Enrollment",
+			{"course": "_Test Course 1", "student": student.name, "program_enrollment": program_enrollment.name}, 'name')
+		make_course_activity(course_enrollment, "Article", "_Test Article 1-1")
 
 	def test_get_progress(self):
 		student = get_student("_test_student_1@example.com")
@@ -30,5 +31,14 @@
 		self.assertTrue(finished in progress)
 		frappe.db.rollback()
 
+	def tearDown(self):
+		for entry in frappe.db.get_all("Course Enrollment"):
+			frappe.delete_doc("Course Enrollment", entry.name)
+
+		for entry in frappe.db.get_all("Program Enrollment"):
+			doc = frappe.get_doc("Program Enrollment", entry.name)
+			doc.cancel()
+			doc.delete()
+
 
 
diff --git a/erpnext/education/doctype/instructor/instructor.js b/erpnext/education/doctype/instructor/instructor.js
index abb47ed..24e80fa 100644
--- a/erpnext/education/doctype/instructor/instructor.js
+++ b/erpnext/education/doctype/instructor/instructor.js
@@ -41,5 +41,24 @@
 				}
 			};
 		});
+
+		frm.set_query("academic_term", "instructor_log", function(_doc, cdt, cdn) {
+			let d = locals[cdt][cdn];
+			return {
+				filters: {
+					"academic_year": d.academic_year
+				}
+			};
+		});
+
+		frm.set_query("course", "instructor_log", function(_doc, cdt, cdn) {
+			let d = locals[cdt][cdn];
+			return {
+				query: "erpnext.education.doctype.program_enrollment.program_enrollment.get_program_courses",
+				filters: {
+					"program": d.program
+				}
+			};
+		});
 	}
 });
\ No newline at end of file
diff --git a/erpnext/education/doctype/instructor_log/instructor_log.json b/erpnext/education/doctype/instructor_log/instructor_log.json
index dc9380f..5b9e1f9 100644
--- a/erpnext/education/doctype/instructor_log/instructor_log.json
+++ b/erpnext/education/doctype/instructor_log/instructor_log.json
@@ -1,336 +1,88 @@
 {
- "allow_copy": 0, 
- "allow_events_in_timeline": 0, 
- "allow_guest_to_view": 0, 
- "allow_import": 0, 
- "allow_rename": 0, 
- "beta": 0, 
- "creation": "2017-12-27 08:55:52.680284", 
- "custom": 0, 
- "docstatus": 0, 
- "doctype": "DocType", 
- "document_type": "", 
- "editable_grid": 1, 
- "engine": "InnoDB", 
+ "actions": [],
+ "creation": "2017-12-27 08:55:52.680284",
+ "doctype": "DocType",
+ "editable_grid": 1,
+ "engine": "InnoDB",
+ "field_order": [
+  "academic_year",
+  "academic_term",
+  "department",
+  "column_break_3",
+  "program",
+  "course",
+  "student_group",
+  "section_break_8",
+  "other_details"
+ ],
  "fields": [
   {
-   "allow_bulk_edit": 0, 
-   "allow_in_quick_entry": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "fieldname": "academic_year", 
-   "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": "Academic Year", 
-   "length": 0, 
-   "no_copy": 0, 
-   "options": "Academic 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": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "translatable": 0, 
-   "unique": 0
-  }, 
+   "fieldname": "academic_year",
+   "fieldtype": "Link",
+   "in_list_view": 1,
+   "label": "Academic Year",
+   "options": "Academic Year",
+   "reqd": 1
+  },
   {
-   "allow_bulk_edit": 0, 
-   "allow_in_quick_entry": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "fieldname": "academic_term", 
-   "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": "Academic Term", 
-   "length": 0, 
-   "no_copy": 0, 
-   "options": "Academic Term", 
-   "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": "academic_term",
+   "fieldtype": "Link",
+   "in_list_view": 1,
+   "label": "Academic Term",
+   "options": "Academic Term"
+  },
   {
-   "allow_bulk_edit": 0, 
-   "allow_in_quick_entry": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "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": 0, 
-   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "translatable": 0, 
-   "unique": 0
-  }, 
+   "fieldname": "department",
+   "fieldtype": "Link",
+   "label": "Department",
+   "options": "Department"
+  },
   {
-   "allow_bulk_edit": 0, 
-   "allow_in_quick_entry": 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, 
-   "translatable": 0, 
-   "unique": 0
-  }, 
+   "fieldname": "column_break_3",
+   "fieldtype": "Column Break"
+  },
   {
-   "allow_bulk_edit": 0, 
-   "allow_in_quick_entry": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "fieldname": "program", 
-   "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": "Program", 
-   "length": 0, 
-   "no_copy": 0, 
-   "options": "Program", 
-   "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": "program",
+   "fieldtype": "Link",
+   "in_list_view": 1,
+   "label": "Program",
+   "options": "Program",
+   "reqd": 1
+  },
   {
-   "allow_bulk_edit": 0, 
-   "allow_in_quick_entry": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "fieldname": "course", 
-   "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": "Course", 
-   "length": 0, 
-   "no_copy": 0, 
-   "options": "Course", 
-   "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": "course",
+   "fieldtype": "Link",
+   "in_list_view": 1,
+   "label": "Course",
+   "options": "Course"
+  },
   {
-   "allow_bulk_edit": 0, 
-   "allow_in_quick_entry": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "fieldname": "student_group", 
-   "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": "Student Group", 
-   "length": 0, 
-   "no_copy": 0, 
-   "options": "Student 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
-  }, 
+   "fieldname": "student_group",
+   "fieldtype": "Link",
+   "label": "Student Group",
+   "options": "Student Group"
+  },
   {
-   "allow_bulk_edit": 0, 
-   "allow_in_quick_entry": 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, 
-   "translatable": 0, 
-   "unique": 0
-  }, 
+   "fieldname": "section_break_8",
+   "fieldtype": "Section Break"
+  },
   {
-   "allow_bulk_edit": 0, 
-   "allow_in_quick_entry": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "fieldname": "other_details", 
-   "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": "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": "other_details",
+   "fieldtype": "Small Text",
+   "label": "Other details"
   }
- ], 
- "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-11-04 03:38:30.902942", 
- "modified_by": "Administrator", 
- "module": "Education", 
- "name": "Instructor Log", 
- "name_case": "", 
- "owner": "Administrator", 
- "permissions": [], 
- "quick_entry": 1, 
- "read_only": 0, 
- "read_only_onload": 0, 
- "restrict_to_domain": "Education", 
- "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": "2020-10-23 15:15:50.759657",
+ "modified_by": "Administrator",
+ "module": "Education",
+ "name": "Instructor Log",
+ "owner": "Administrator",
+ "permissions": [],
+ "quick_entry": 1,
+ "restrict_to_domain": "Education",
+ "sort_field": "modified",
+ "sort_order": "DESC",
+ "track_changes": 1
 }
\ No newline at end of file
diff --git a/erpnext/education/doctype/program/test_program.py b/erpnext/education/doctype/program/test_program.py
index 3bcca3a..d753036 100644
--- a/erpnext/education/doctype/program/test_program.py
+++ b/erpnext/education/doctype/program/test_program.py
@@ -49,6 +49,11 @@
 		self.assertEqual(course[1].name, "_Test Course 2")
 		frappe.db.rollback()
 
+	def tearDown(self):
+		for dt in ["Program", "Course", "Topic", "Article"]:
+			for entry in frappe.get_all(dt):
+				frappe.delete_doc(dt, entry.program)
+
 def make_program(name):
 	program = frappe.get_doc({
 		"doctype": "Program",
@@ -68,7 +73,7 @@
 		program = frappe.get_doc("Program", program_name)
 	course_list = [make_course(course_name) for course_name in course_name_list]
 	for course in course_list:
-		program.append("courses", {"course": course})
+		program.append("courses", {"course": course, "required": 1})
 	program.save()
 	return program
 
diff --git a/erpnext/education/doctype/program_course/program_course.json b/erpnext/education/doctype/program_course/program_course.json
index 940358e..dc6b3fc 100644
--- a/erpnext/education/doctype/program_course/program_course.json
+++ b/erpnext/education/doctype/program_course/program_course.json
@@ -17,9 +17,7 @@
    "in_list_view": 1,
    "label": "Course",
    "options": "Course",
-   "reqd": 1,
-   "show_days": 1,
-   "show_seconds": 1
+   "reqd": 1
   },
   {
    "fetch_from": "course.course_name",
@@ -27,23 +25,19 @@
    "fieldtype": "Data",
    "in_list_view": 1,
    "label": "Course Name",
-   "read_only": 1,
-   "show_days": 1,
-   "show_seconds": 1
+   "read_only": 1
   },
   {
-   "default": "0",
+   "default": "1",
    "fieldname": "required",
    "fieldtype": "Check",
    "in_list_view": 1,
-   "label": "Mandatory",
-   "show_days": 1,
-   "show_seconds": 1
+   "label": "Mandatory"
   }
  ],
  "istable": 1,
  "links": [],
- "modified": "2020-06-09 18:56:10.213241",
+ "modified": "2020-09-15 18:14:22.816795",
  "modified_by": "Administrator",
  "module": "Education",
  "name": "Program Course",
diff --git a/erpnext/education/doctype/program_enrollment/program_enrollment.js b/erpnext/education/doctype/program_enrollment/program_enrollment.js
index e3b3e9f..f9c65fb 100644
--- a/erpnext/education/doctype/program_enrollment/program_enrollment.js
+++ b/erpnext/education/doctype/program_enrollment/program_enrollment.js
@@ -2,16 +2,24 @@
 // For license information, please see license.txt
 
 
-frappe.ui.form.on("Program Enrollment", {
+frappe.ui.form.on('Program Enrollment', {
 	setup: function(frm) {
 		frm.add_fetch('fee_structure', 'total_amount', 'amount');
 	},
 
-	onload: function(frm, cdt, cdn){
-		frm.set_query("academic_term", "fees", function(){
-			return{
-				"filters":{
-					"academic_year": (frm.doc.academic_year)
+	onload: function(frm) {
+		frm.set_query('academic_term', function() {
+			return {
+				'filters':{
+					'academic_year': frm.doc.academic_year
+				}
+			};
+		});
+
+		frm.set_query('academic_term', 'fees', function() {
+			return {
+				'filters':{
+					'academic_year': frm.doc.academic_year
 				}
 			};
 		});
@@ -24,9 +32,9 @@
 		};
 
 		if (frm.doc.program) {
-			frm.set_query("course", "courses", function(doc, cdt, cdn) {
-				return{
-					query: "erpnext.education.doctype.program_enrollment.program_enrollment.get_program_courses",
+			frm.set_query('course', 'courses', function() {
+				return {
+					query: 'erpnext.education.doctype.program_enrollment.program_enrollment.get_program_courses',
 					filters: {
 						'program': frm.doc.program
 					}
@@ -34,9 +42,9 @@
 			});
 		}
 
-		frm.set_query("student", function() {
+		frm.set_query('student', function() {
 			return{
-				query: "erpnext.education.doctype.program_enrollment.program_enrollment.get_students",
+				query: 'erpnext.education.doctype.program_enrollment.program_enrollment.get_students',
 				filters: {
 					'academic_year': frm.doc.academic_year,
 					'academic_term': frm.doc.academic_term
@@ -49,14 +57,14 @@
 		frm.events.get_courses(frm);
 		if (frm.doc.program) {
 			frappe.call({
-				method: "erpnext.education.api.get_fee_schedule",
+				method: 'erpnext.education.api.get_fee_schedule',
 				args: {
-					"program": frm.doc.program,
-					"student_category": frm.doc.student_category
+					'program': frm.doc.program,
+					'student_category': frm.doc.student_category
 				},
 				callback: function(r) {
-					if(r.message) {
-						frm.set_value("fees" ,r.message);
+					if (r.message) {
+						frm.set_value('fees' ,r.message);
 						frm.events.get_courses(frm);
 					}
 				}
@@ -65,17 +73,17 @@
 	},
 
 	student_category: function() {
-		frappe.ui.form.trigger("Program Enrollment", "program");
+		frappe.ui.form.trigger('Program Enrollment', 'program');
 	},
 
 	get_courses: function(frm) {
-		frm.set_value("courses",[]);
+		frm.set_value('courses',[]);
 		frappe.call({
-			method: "get_courses",
+			method: 'get_courses',
 			doc:frm.doc,
 			callback: function(r) {
-				if(r.message) {
-					frm.set_value("courses", r.message);
+				if (r.message) {
+					frm.set_value('courses', r.message);
 				}
 			}
 		})
@@ -84,10 +92,10 @@
 
 frappe.ui.form.on('Program Enrollment Course', {
 	courses_add: function(frm){
-		frm.fields_dict['courses'].grid.get_field('course').get_query = function(doc){
+		frm.fields_dict['courses'].grid.get_field('course').get_query = function(doc) {
 			var course_list = [];
 			if(!doc.__islocal) course_list.push(doc.name);
-			$.each(doc.courses, function(idx, val){
+			$.each(doc.courses, function(_idx, val) {
 				if (val.course) course_list.push(val.course);
 			});
 			return { filters: [['Course', 'name', 'not in', course_list]] };
diff --git a/erpnext/education/doctype/program_enrollment/program_enrollment.json b/erpnext/education/doctype/program_enrollment/program_enrollment.json
index 1d8a434..4a00fd0 100644
--- a/erpnext/education/doctype/program_enrollment/program_enrollment.json
+++ b/erpnext/education/doctype/program_enrollment/program_enrollment.json
@@ -1,775 +1,218 @@
 {
- "allow_copy": 0, 
- "allow_events_in_timeline": 0, 
- "allow_guest_to_view": 0, 
- "allow_import": 1, 
- "allow_rename": 0, 
- "autoname": "EDU-ENR-.YYYY.-.#####", 
- "beta": 0, 
- "creation": "2015-12-02 12:58:32.916080", 
- "custom": 0, 
- "docstatus": 0, 
- "doctype": "DocType", 
- "document_type": "Document", 
- "editable_grid": 0, 
- "engine": "InnoDB", 
+ "actions": [],
+ "allow_import": 1,
+ "autoname": "EDU-ENR-.YYYY.-.#####",
+ "creation": "2015-12-02 12:58:32.916080",
+ "doctype": "DocType",
+ "document_type": "Document",
+ "engine": "InnoDB",
+ "field_order": [
+  "student",
+  "student_name",
+  "student_category",
+  "student_batch_name",
+  "school_house",
+  "column_break_4",
+  "program",
+  "academic_year",
+  "academic_term",
+  "enrollment_date",
+  "boarding_student",
+  "enrolled_courses",
+  "courses",
+  "transportation",
+  "mode_of_transportation",
+  "column_break_13",
+  "vehicle_no",
+  "section_break_7",
+  "fees",
+  "amended_from",
+  "image"
+ ],
  "fields": [
   {
-   "allow_bulk_edit": 0, 
-   "allow_in_quick_entry": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "fieldname": "student", 
-   "fieldtype": "Link", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_global_search": 1, 
-   "in_list_view": 0, 
-   "in_standard_filter": 0, 
-   "label": "Student", 
-   "length": 0, 
-   "no_copy": 0, 
-   "options": "Student", 
-   "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": "student",
+   "fieldtype": "Link",
+   "in_global_search": 1,
+   "label": "Student",
+   "options": "Student",
+   "reqd": 1
+  },
   {
-   "allow_bulk_edit": 0, 
-   "allow_in_quick_entry": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "fetch_from": "student.title", 
-   "fieldname": "student_name", 
-   "fieldtype": "Read Only", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_global_search": 1, 
-   "in_list_view": 0, 
-   "in_standard_filter": 0, 
-   "label": "Student 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
-  }, 
+   "fetch_from": "student.title",
+   "fieldname": "student_name",
+   "fieldtype": "Read Only",
+   "in_global_search": 1,
+   "label": "Student Name",
+   "read_only": 1
+  },
   {
-   "allow_bulk_edit": 0, 
-   "allow_in_quick_entry": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "fieldname": "student_category", 
-   "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": "Student Category", 
-   "length": 0, 
-   "no_copy": 0, 
-   "options": "Student 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": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "translatable": 0, 
-   "unique": 0
-  }, 
+   "fieldname": "student_category",
+   "fieldtype": "Link",
+   "label": "Student Category",
+   "options": "Student Category"
+  },
   {
-   "allow_bulk_edit": 0, 
-   "allow_in_quick_entry": 0, 
-   "allow_on_submit": 1, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "fieldname": "student_batch_name", 
-   "fieldtype": "Link", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_global_search": 1, 
-   "in_list_view": 0, 
-   "in_standard_filter": 0, 
-   "label": "Student Batch", 
-   "length": 0, 
-   "no_copy": 0, 
-   "options": "Student Batch Name", 
-   "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": "student_batch_name",
+   "fieldtype": "Link",
+   "in_global_search": 1,
+   "label": "Student Batch",
+   "options": "Student Batch Name"
+  },
   {
-   "allow_bulk_edit": 0, 
-   "allow_in_quick_entry": 0, 
-   "allow_on_submit": 1, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "fieldname": "school_house", 
-   "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": "School House", 
-   "length": 0, 
-   "no_copy": 0, 
-   "options": "School House", 
-   "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": "school_house",
+   "fieldtype": "Link",
+   "label": "School House",
+   "options": "School House"
+  },
   {
-   "allow_bulk_edit": 0, 
-   "allow_in_quick_entry": 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_in_quick_entry": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "fieldname": "program", 
-   "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": "Program", 
-   "length": 0, 
-   "no_copy": 0, 
-   "options": "Program", 
-   "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": "program",
+   "fieldtype": "Link",
+   "in_list_view": 1,
+   "in_standard_filter": 1,
+   "label": "Program",
+   "options": "Program",
+   "reqd": 1
+  },
   {
-   "allow_bulk_edit": 0, 
-   "allow_in_quick_entry": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "fieldname": "academic_year", 
-   "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": "Academic Year", 
-   "length": 0, 
-   "no_copy": 0, 
-   "options": "Academic 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, 
-   "translatable": 0, 
-   "unique": 0
-  }, 
+   "fieldname": "academic_year",
+   "fieldtype": "Link",
+   "in_list_view": 1,
+   "in_standard_filter": 1,
+   "label": "Academic Year",
+   "options": "Academic Year",
+   "reqd": 1
+  },
   {
-   "allow_bulk_edit": 0, 
-   "allow_in_quick_entry": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "fieldname": "academic_term", 
-   "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": "Academic Term", 
-   "length": 0, 
-   "no_copy": 0, 
-   "options": "Academic Term", 
-   "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": "academic_term",
+   "fieldtype": "Link",
+   "label": "Academic Term",
+   "options": "Academic Term"
+  },
   {
-   "allow_bulk_edit": 0, 
-   "allow_in_quick_entry": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "default": "Today", 
-   "fieldname": "enrollment_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": "Enrollment 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
-  }, 
+   "default": "Today",
+   "fieldname": "enrollment_date",
+   "fieldtype": "Date",
+   "label": "Enrollment Date",
+   "reqd": 1
+  },
   {
-   "allow_bulk_edit": 0, 
-   "allow_in_quick_entry": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "default": "0", 
-   "description": "Check this if the Student is residing at the Institute's Hostel.", 
-   "fieldname": "boarding_student", 
-   "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": "Boarding Student", 
-   "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
-  }, 
+   "default": "0",
+   "description": "Check this if the Student is residing at the Institute's Hostel.",
+   "fieldname": "boarding_student",
+   "fieldtype": "Check",
+   "label": "Boarding Student"
+  },
   {
-   "allow_bulk_edit": 0, 
-   "allow_in_quick_entry": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 1, 
-   "collapsible_depends_on": "vehicle_no", 
-   "columns": 0, 
-   "fieldname": "transportation", 
-   "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": "Transportation", 
-   "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
-  }, 
+   "collapsible": 1,
+   "collapsible_depends_on": "vehicle_no",
+   "fieldname": "transportation",
+   "fieldtype": "Section Break",
+   "label": "Transportation"
+  },
   {
-   "allow_bulk_edit": 0, 
-   "allow_in_quick_entry": 0, 
-   "allow_on_submit": 1, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "fieldname": "mode_of_transportation", 
-   "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": "Mode of Transportation", 
-   "length": 0, 
-   "no_copy": 0, 
-   "options": "\nWalking\nInstitute's Bus\nPublic Transport\nSelf-Driving Vehicle\nPick/Drop by Guardian", 
-   "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": "mode_of_transportation",
+   "fieldtype": "Select",
+   "label": "Mode of Transportation",
+   "options": "\nWalking\nInstitute's Bus\nPublic Transport\nSelf-Driving Vehicle\nPick/Drop by Guardian"
+  },
   {
-   "allow_bulk_edit": 0, 
-   "allow_in_quick_entry": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "fieldname": "column_break_13", 
-   "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_13",
+   "fieldtype": "Column Break"
+  },
   {
-   "allow_bulk_edit": 0, 
-   "allow_in_quick_entry": 0, 
-   "allow_on_submit": 1, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "fieldname": "vehicle_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": "Vehicle/Bus 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
-  }, 
+   "allow_on_submit": 1,
+   "fieldname": "vehicle_no",
+   "fieldtype": "Data",
+   "label": "Vehicle/Bus Number"
+  },
   {
-   "allow_bulk_edit": 0, 
-   "allow_in_quick_entry": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 1, 
-   "columns": 0, 
-   "fieldname": "enrolled_courses", 
-   "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": "Enrolled courses", 
-   "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": "enrolled_courses",
+   "fieldtype": "Section Break",
+   "label": "Enrolled courses"
+  },
   {
-   "allow_bulk_edit": 0, 
-   "allow_in_quick_entry": 0, 
-   "allow_on_submit": 1, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "fieldname": "courses", 
-   "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": "Courses", 
-   "length": 0, 
-   "no_copy": 0, 
-   "options": "Program Enrollment Course", 
-   "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": "courses",
+   "fieldtype": "Table",
+   "label": "Courses",
+   "options": "Program Enrollment Course"
+  },
   {
-   "allow_bulk_edit": 0, 
-   "allow_in_quick_entry": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 1, 
-   "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, 
-   "label": "Fees", 
-   "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
-  }, 
+   "collapsible": 1,
+   "fieldname": "section_break_7",
+   "fieldtype": "Section Break",
+   "label": "Fees"
+  },
   {
-   "allow_bulk_edit": 0, 
-   "allow_in_quick_entry": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "fieldname": "fees", 
-   "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": "Fees", 
-   "length": 0, 
-   "no_copy": 0, 
-   "options": "Program Fee", 
-   "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, 
-   "width": ""
-  }, 
+   "fieldname": "fees",
+   "fieldtype": "Table",
+   "label": "Fees",
+   "options": "Program Fee"
+  },
   {
-   "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": "Program Enrollment", 
-   "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": "Program Enrollment",
+   "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, 
-   "fieldname": "image", 
-   "fieldtype": "Attach Image", 
-   "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": "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, 
-   "translatable": 0, 
-   "unique": 0
+   "fieldname": "image",
+   "fieldtype": "Attach Image",
+   "hidden": 1,
+   "label": "Image"
   }
- ], 
- "has_web_view": 0, 
- "hide_heading": 0, 
- "hide_toolbar": 0, 
- "idx": 0, 
- "image_field": "image", 
- "image_view": 0, 
- "in_create": 0, 
- "is_submittable": 1, 
- "issingle": 0, 
- "istable": 0, 
- "max_attachments": 0, 
- "menu_index": 0, 
- "modified": "2018-11-07 21:13:06.502279", 
- "modified_by": "Administrator", 
- "module": "Education", 
- "name": "Program Enrollment", 
- "name_case": "", 
- "owner": "Administrator", 
+ ],
+ "image_field": "image",
+ "is_submittable": 1,
+ "links": [],
+ "modified": "2020-09-15 18:12:11.988565",
+ "modified_by": "Administrator",
+ "module": "Education",
+ "name": "Program Enrollment",
+ "owner": "Administrator",
  "permissions": [
   {
-   "amend": 1, 
-   "cancel": 1, 
-   "create": 1, 
-   "delete": 1, 
-   "email": 1, 
-   "export": 1, 
-   "if_owner": 0, 
-   "import": 0, 
-   "permlevel": 0, 
-   "print": 1, 
-   "read": 1, 
-   "report": 1, 
-   "role": "Academics User", 
-   "set_user_permissions": 0, 
-   "share": 1, 
-   "submit": 1, 
+   "amend": 1,
+   "cancel": 1,
+   "create": 1,
+   "delete": 1,
+   "email": 1,
+   "export": 1,
+   "print": 1,
+   "read": 1,
+   "report": 1,
+   "role": "Academics User",
+   "share": 1,
+   "submit": 1,
    "write": 1
-  }, 
+  },
   {
-   "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": "LMS User", 
-   "set_user_permissions": 0, 
-   "share": 1, 
-   "submit": 1, 
+   "create": 1,
+   "email": 1,
+   "export": 1,
+   "print": 1,
+   "read": 1,
+   "report": 1,
+   "role": "LMS User",
+   "share": 1,
+   "submit": 1,
    "write": 1
   }
- ], 
- "quick_entry": 0, 
- "read_only": 0, 
- "read_only_onload": 0, 
- "restrict_to_domain": "Education", 
- "show_name_in_global_search": 1, 
- "sort_field": "modified", 
- "sort_order": "DESC", 
- "title_field": "student_name", 
- "track_changes": 0, 
- "track_seen": 0, 
- "track_views": 0
+ ],
+ "restrict_to_domain": "Education",
+ "show_name_in_global_search": 1,
+ "sort_field": "modified",
+ "sort_order": "DESC",
+ "title_field": "student_name"
 }
\ No newline at end of file
diff --git a/erpnext/education/doctype/program_enrollment/program_enrollment.py b/erpnext/education/doctype/program_enrollment/program_enrollment.py
index 3e27670..6fbcd8a 100644
--- a/erpnext/education/doctype/program_enrollment/program_enrollment.py
+++ b/erpnext/education/doctype/program_enrollment/program_enrollment.py
@@ -7,12 +7,15 @@
 from frappe import msgprint, _
 from frappe.model.document import Document
 from frappe.desk.reportview import get_match_cond, get_filters_cond
-from frappe.utils import comma_and
+from frappe.utils import comma_and, get_link_to_form, getdate
 import erpnext.www.lms as lms
 
 class ProgramEnrollment(Document):
 	def validate(self):
 		self.validate_duplication()
+		self.validate_academic_year()
+		if self.academic_term:
+			self.validate_academic_term()
 		if not self.student_name:
 			self.student_name = frappe.db.get_value("Student", self.student, "title")
 		if not self.courses:
@@ -23,11 +26,34 @@
 		self.make_fee_records()
 		self.create_course_enrollments()
 
+	def validate_academic_year(self):
+		start_date, end_date = frappe.db.get_value("Academic Year", self.academic_year, ["year_start_date", "year_end_date"])
+		if self.enrollment_date:
+			if start_date and getdate(self.enrollment_date) < getdate(start_date):
+				frappe.throw(_("Enrollment Date cannot be before the Start Date of the Academic Year {0}").format(
+					get_link_to_form("Academic Year", self.academic_year)))
+
+			if end_date and getdate(self.enrollment_date) > getdate(end_date):
+				frappe.throw(_("Enrollment Date cannot be after the End Date of the Academic Term {0}").format(
+					get_link_to_form("Academic Year", self.academic_year)))
+
+	def validate_academic_term(self):
+		start_date, end_date = frappe.db.get_value("Academic Term", self.academic_term, ["term_start_date", "term_end_date"])
+		if self.enrollment_date:
+			if start_date and getdate(self.enrollment_date) < getdate(start_date):
+				frappe.throw(_("Enrollment Date cannot be before the Start Date of the Academic Term {0}").format(
+					get_link_to_form("Academic Term", self.academic_term)))
+
+			if end_date and getdate(self.enrollment_date) > getdate(end_date):
+				frappe.throw(_("Enrollment Date cannot be after the End Date of the Academic Term {0}").format(
+					get_link_to_form("Academic Term", self.academic_term)))
+
 	def validate_duplication(self):
 		enrollment = frappe.get_all("Program Enrollment", filters={
 			"student": self.student,
 			"program": self.program,
 			"academic_year": self.academic_year,
+			"academic_term": self.academic_term,
 			"docstatus": ("<", 2),
 			"name": ("!=", self.name)
 		})
@@ -70,10 +96,9 @@
 
 	def create_course_enrollments(self):
 		student = frappe.get_doc("Student", self.student)
-		program = frappe.get_doc("Program", self.program)
-		course_list = [course.course for course in program.courses]
+		course_list = [course.course for course in self.courses]
 		for course_name in course_list:
-			student.enroll_in_course(course_name=course_name, program_enrollment=self.name)
+			student.enroll_in_course(course_name=course_name, program_enrollment=self.name, enrollment_date=self.enrollment_date)
 
 	def get_all_course_enrollments(self):
 		course_enrollment_names = frappe.get_list("Course Enrollment", filters={'program_enrollment': self.name})
diff --git a/erpnext/education/doctype/program_enrollment/test_program_enrollment.py b/erpnext/education/doctype/program_enrollment/test_program_enrollment.py
index c6cbee1..fec6422 100644
--- a/erpnext/education/doctype/program_enrollment/test_program_enrollment.py
+++ b/erpnext/education/doctype/program_enrollment/test_program_enrollment.py
@@ -23,4 +23,13 @@
 		course_enrollments = student.get_all_course_enrollments()
 		self.assertTrue("_Test Course 1" in course_enrollments.keys())
 		self.assertTrue("_Test Course 2" in course_enrollments.keys())
-		frappe.db.rollback()
\ No newline at end of file
+		frappe.db.rollback()
+
+	def tearDown(self):
+		for entry in frappe.db.get_all("Course Enrollment"):
+			frappe.delete_doc("Course Enrollment", entry.name)
+
+		for entry in frappe.db.get_all("Program Enrollment"):
+			doc = frappe.get_doc("Program Enrollment", entry.name)
+			doc.cancel()
+			doc.delete()
\ No newline at end of file
diff --git a/erpnext/education/doctype/student/student.py b/erpnext/education/doctype/student/student.py
index e0d7514..81626f1 100644
--- a/erpnext/education/doctype/student/student.py
+++ b/erpnext/education/doctype/student/student.py
@@ -147,7 +147,7 @@
 			enrollment.save(ignore_permissions=True)
 		except frappe.exceptions.ValidationError:
 			enrollment_name = frappe.get_list("Course Enrollment", filters={"student": self.name, "course": course_name, "program_enrollment": program_enrollment})[0].name
-			return frappe.get_doc("Program Enrollment", enrollment_name)
+			return frappe.get_doc("Course Enrollment", enrollment_name)
 		else:
 			return enrollment
 
diff --git a/erpnext/education/doctype/student/test_student.py b/erpnext/education/doctype/student/test_student.py
index 8610edb..2e52637 100644
--- a/erpnext/education/doctype/student/test_student.py
+++ b/erpnext/education/doctype/student/test_student.py
@@ -42,6 +42,16 @@
 		self.assertTrue("_Test Course 2" in course_enrollments.keys())
 		frappe.db.rollback()
 
+	def tearDown(self):
+		for entry in frappe.db.get_all("Course Enrollment"):
+			frappe.delete_doc("Course Enrollment", entry.name)
+
+		for entry in frappe.db.get_all("Program Enrollment"):
+			doc = frappe.get_doc("Program Enrollment", entry.name)
+			doc.cancel()
+			doc.delete()
+
+
 def create_student(student_dict):
 	student = get_student(student_dict['email'])
 	if not student:
diff --git a/erpnext/education/doctype/student_admission/student_admission.json b/erpnext/education/doctype/student_admission/student_admission.json
index 1096888..75f2162 100644
--- a/erpnext/education/doctype/student_admission/student_admission.json
+++ b/erpnext/education/doctype/student_admission/student_admission.json
@@ -51,12 +51,14 @@
    "fieldname": "admission_start_date",
    "fieldtype": "Date",
    "label": "Admission Start Date",
+   "mandatory_depends_on": "enable_admission_application",
    "no_copy": 1
   },
   {
    "fieldname": "admission_end_date",
    "fieldtype": "Date",
    "label": "Admission End Date",
+   "mandatory_depends_on": "enable_admission_application",
    "no_copy": 1
   },
   {
@@ -83,6 +85,7 @@
   },
   {
    "default": "0",
+   "depends_on": "published",
    "fieldname": "enable_admission_application",
    "fieldtype": "Check",
    "label": "Enable Admission Application"
@@ -91,7 +94,7 @@
  "has_web_view": 1,
  "is_published_field": "published",
  "links": [],
- "modified": "2020-06-15 20:18:38.591626",
+ "modified": "2020-09-18 00:14:54.615321",
  "modified_by": "Administrator",
  "module": "Education",
  "name": "Student Admission",
diff --git a/erpnext/education/doctype/student_admission/student_admission.py b/erpnext/education/doctype/student_admission/student_admission.py
index 2781c9c..0febb96 100644
--- a/erpnext/education/doctype/student_admission/student_admission.py
+++ b/erpnext/education/doctype/student_admission/student_admission.py
@@ -19,6 +19,9 @@
 		if not self.route:		#pylint: disable=E0203
 			self.route = "admissions/" + "-".join(self.title.split(" "))
 
+		if self.enable_admission_application and not self.program_details:
+			frappe.throw(_("Please add programs to enable admission application."))
+
 	def get_context(self, context):
 		context.no_cache = 1
 		context.show_sidebar = True
diff --git a/erpnext/education/doctype/student_admission/templates/student_admission.html b/erpnext/education/doctype/student_admission/templates/student_admission.html
index e5a9ead..7ff3906 100644
--- a/erpnext/education/doctype/student_admission/templates/student_admission.html
+++ b/erpnext/education/doctype/student_admission/templates/student_admission.html
@@ -43,31 +43,35 @@
 				<thead>
 					<tr class="active">
 						<th style="width: 90px">Program/Std.</th>
-						<th style="width: 170px">Minumum Age</th>
-						<th style="width: 170px">Maximum Age</th>
+						<th style="width: 180px">Description</th>
+						<th style="width: 100px">Minumum Age</th>
+						<th style="width: 100px">Maximum Age</th>
 						<th style="width: 100px">Application Fee</th>
+						{%- if doc.enable_admission_application and frappe.utils.getdate(doc.admission_start_date) <= today -%}
+							<th style="width: 120px"></th>
+						{% endif %}
 					</tr>
 				</thead>
 				<tbody>
 					{% for row in program_details %}
 						<tr>
 							<td>{{ row.program }}</td>
+							<td><div class="text-muted">{{ row.description if row.description else '' }}</div></td>
 							<td>{{ row.min_age }}</td>
 							<td>{{ row.max_age }}</td>
 							<td>{{ row.application_fee }}</td>
+							{%- if doc.enable_admission_application and frappe.utils.getdate(doc.admission_start_date) <= today -%}
+							<td>
+								<a class='btn btn-sm btn-primary' href='/student-applicant?new=1&student_admission={{doc.name}}&program={{row.program}}&academic_year={{academic_year}}'>
+									{{ _("Apply Now") }}
+								</a>
+							</td>
+							{% endif %}
 						</tr>
 					{% endfor %}
 				</tbody>
 			</table>
 		</div>
 	{% endif %}
-	{%- if doc.enable_admission_application -%}
-		<br>
-		<p>
-			<a class='btn btn-primary'
-			href='/student-applicant?new=1&student_admission={{doc.name}}'>
-			{{ _("Apply Now") }}</a>
-		</p>
-	{% endif %}
 
 {% endblock %}
diff --git a/erpnext/education/doctype/student_admission/templates/student_admission_row.html b/erpnext/education/doctype/student_admission/templates/student_admission_row.html
index e049773..cf22436 100644
--- a/erpnext/education/doctype/student_admission/templates/student_admission_row.html
+++ b/erpnext/education/doctype/student_admission/templates/student_admission_row.html
@@ -1,8 +1,8 @@
-<div class="web-list-item">
+<div class="web-list-item transaction-list-item">
 	{% set today = frappe.utils.getdate(frappe.utils.nowdate()) %}
-	<a href = "{{ doc.route }}/">
+	<a href = "{{ doc.route }}/" class="no-underline">
 		<div class="row">
-			<div class="col-sm-6 text-left small bold" style="margin-top: -3px;"">
+			<div class="col-sm-4 bold">
 				<span class="indicator
 				{% if frappe.utils.getdate(doc.admission_end_date) == today %}
 					red
@@ -15,6 +15,14 @@
 				{% endif  %}
 				">{{ doc.title }}</span>
 			</div>
+			<div class="col-sm-2 small">
+				<span class="text-muted">
+					Academic Year
+				</span>
+				<div class="text-muted bold">
+					{{ doc.academic_year }}
+				</div>
+			</div>
 			<div class="col-sm-3 small">
 				<span class="text-muted">
 					Starts on
@@ -27,7 +35,7 @@
 				<span class="text-muted">
 					Ends on
 				</span>
-				<div class="bold">
+				<div class=" text-muted bold">
 					{{ frappe.format_date(doc.admission_end_date) }}
 				</div>
 			</div>
diff --git a/erpnext/education/doctype/student_admission_program/student_admission_program.json b/erpnext/education/doctype/student_admission_program/student_admission_program.json
index e9f041e..d14b9a4 100644
--- a/erpnext/education/doctype/student_admission_program/student_admission_program.json
+++ b/erpnext/education/doctype/student_admission_program/student_admission_program.json
@@ -8,6 +8,7 @@
   "program",
   "min_age",
   "max_age",
+  "description",
   "column_break_4",
   "application_fee",
   "applicant_naming_series"
@@ -18,52 +19,47 @@
    "fieldtype": "Link",
    "in_list_view": 1,
    "label": "Program",
-   "options": "Program",
-   "show_days": 1,
-   "show_seconds": 1
+   "options": "Program"
   },
   {
    "fieldname": "column_break_4",
-   "fieldtype": "Column Break",
-   "show_days": 1,
-   "show_seconds": 1
+   "fieldtype": "Column Break"
   },
   {
    "fieldname": "application_fee",
    "fieldtype": "Currency",
    "in_list_view": 1,
-   "label": "Application Fee",
-   "show_days": 1,
-   "show_seconds": 1
+   "label": "Application Fee"
   },
   {
    "fieldname": "applicant_naming_series",
    "fieldtype": "Data",
    "in_list_view": 1,
-   "label": "Naming Series (for Student Applicant)",
-   "show_days": 1,
-   "show_seconds": 1
+   "label": "Naming Series (for Student Applicant)"
   },
   {
    "fieldname": "min_age",
    "fieldtype": "Int",
    "in_list_view": 1,
-   "label": "Minimum Age",
-   "show_days": 1,
-   "show_seconds": 1
+   "label": "Minimum Age"
   },
   {
    "fieldname": "max_age",
    "fieldtype": "Int",
    "in_list_view": 1,
-   "label": "Maximum Age",
-   "show_days": 1,
-   "show_seconds": 1
+   "label": "Maximum Age"
+  },
+  {
+   "fetch_from": "program.description",
+   "fetch_if_empty": 1,
+   "fieldname": "description",
+   "fieldtype": "Small Text",
+   "label": "Description"
   }
  ],
  "istable": 1,
  "links": [],
- "modified": "2020-06-10 23:06:30.037404",
+ "modified": "2020-10-05 13:03:42.005985",
  "modified_by": "Administrator",
  "module": "Education",
  "name": "Student Admission Program",
diff --git a/erpnext/education/doctype/student_applicant/student_applicant.json b/erpnext/education/doctype/student_applicant/student_applicant.json
index bca38fb..6df9b9a 100644
--- a/erpnext/education/doctype/student_applicant/student_applicant.json
+++ b/erpnext/education/doctype/student_applicant/student_applicant.json
@@ -168,6 +168,7 @@
    "fieldname": "student_email_id",
    "fieldtype": "Data",
    "label": "Student Email Address",
+   "options": "Email",
    "unique": 1
   },
   {
@@ -261,7 +262,7 @@
  "image_field": "image",
  "is_submittable": 1,
  "links": [],
- "modified": "2020-09-07 19:31:30.063563",
+ "modified": "2020-10-05 13:59:45.631647",
  "modified_by": "Administrator",
  "module": "Education",
  "name": "Student Applicant",
diff --git a/erpnext/education/doctype/student_attendance/student_attendance.py b/erpnext/education/doctype/student_attendance/student_attendance.py
index c1b6850..595dff9 100644
--- a/erpnext/education/doctype/student_attendance/student_attendance.py
+++ b/erpnext/education/doctype/student_attendance/student_attendance.py
@@ -6,13 +6,13 @@
 import frappe
 from frappe.model.document import Document
 from frappe import _
-from frappe.utils import get_link_to_form
+from frappe.utils import get_link_to_form, getdate
 from erpnext.education.api import get_student_group_students
 
-
 class StudentAttendance(Document):
 	def validate(self):
 		self.validate_mandatory()
+		self.validate_date()
 		self.set_date()
 		self.set_student_group()
 		self.validate_student()
@@ -27,6 +27,18 @@
 			frappe.throw(_('{0} or {1} is mandatory').format(frappe.bold('Student Group'),
 				frappe.bold('Course Schedule')), title=_('Mandatory Fields'))
 
+	def validate_date(self):
+		if not self.leave_application and getdate(self.date) > getdate():
+			frappe.throw(_('Attendance cannot be marked for future dates.'))
+
+		if self.student_group:
+			academic_year = frappe.db.get_value('Student Group', self.student_group, 'academic_year')
+			if academic_year:
+				year_start_date, year_end_date = frappe.db.get_value('Academic Year', academic_year, ['year_start_date', 'year_end_date'])
+				if year_start_date and year_end_date:
+					if getdate(self.date) < getdate(year_start_date) or getdate(self.date) > getdate(year_end_date):
+						frappe.throw(_('Attendance cannot be marked outside of Academic Year {0}').format(academic_year))
+
 	def set_student_group(self):
 		if self.course_schedule:
 			self.student_group = frappe.db.get_value('Course Schedule', self.course_schedule, 'student_group')
diff --git a/erpnext/education/doctype/student_attendance_tool/student_attendance_tool.js b/erpnext/education/doctype/student_attendance_tool/student_attendance_tool.js
index 0384505..b59d848 100644
--- a/erpnext/education/doctype/student_attendance_tool/student_attendance_tool.js
+++ b/erpnext/education/doctype/student_attendance_tool/student_attendance_tool.js
@@ -52,6 +52,8 @@
 	},
 
 	date: function(frm) {
+		if (frm.doc.date > frappe.datetime.get_today())
+			frappe.throw(__("Cannot mark attendance for future dates."));
 		frm.trigger("student_group");
 	},
 
@@ -133,8 +135,8 @@
 					return !stud.disabled && !stud.checked;
 				});
 
-				frappe.confirm(__("Do you want to update attendance?<br>Present: {0}\
-					<br>Absent: {1}", [students_present.length, students_absent.length]),
+				frappe.confirm(__("Do you want to update attendance? <br> Present: {0} <br> Absent: {1}",
+					[students_present.length, students_absent.length]),
 					function() {	//ifyes
 						if(!frappe.request.ajax_count) {
 							frappe.call({
diff --git a/erpnext/education/doctype/student_attendance_tool/student_attendance_tool.json b/erpnext/education/doctype/student_attendance_tool/student_attendance_tool.json
index 26b28b3..ee8f484 100644
--- a/erpnext/education/doctype/student_attendance_tool/student_attendance_tool.json
+++ b/erpnext/education/doctype/student_attendance_tool/student_attendance_tool.json
@@ -1,333 +1,118 @@
 {
- "allow_copy": 1, 
- "allow_guest_to_view": 0, 
- "allow_import": 0, 
- "allow_rename": 0, 
- "beta": 0, 
- "creation": "2016-11-16 17:12:46.437539", 
- "custom": 0, 
- "docstatus": 0, 
- "doctype": "DocType", 
- "document_type": "", 
- "editable_grid": 1, 
- "engine": "InnoDB", 
+ "actions": [],
+ "allow_copy": 1,
+ "creation": "2016-11-16 17:12:46.437539",
+ "doctype": "DocType",
+ "editable_grid": 1,
+ "engine": "InnoDB",
+ "field_order": [
+  "based_on",
+  "group_based_on",
+  "column_break_2",
+  "student_group",
+  "academic_year",
+  "academic_term",
+  "course_schedule",
+  "date",
+  "attendance",
+  "students_html"
+ ],
  "fields": [
   {
-   "allow_bulk_edit": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "default": "", 
-   "fieldname": "based_on", 
-   "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": "Based On", 
-   "length": 0, 
-   "no_copy": 0, 
-   "options": "Student Group\nCourse Schedule", 
-   "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": "based_on",
+   "fieldtype": "Select",
+   "label": "Based On",
+   "options": "Student Group\nCourse Schedule"
+  },
   {
-   "allow_bulk_edit": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "default": "Batch", 
-   "depends_on": "eval:doc.based_on == \"Student Group\"", 
-   "fieldname": "group_based_on", 
-   "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": "Group Based On", 
-   "length": 0, 
-   "no_copy": 0, 
-   "options": "Batch\nCourse\nActivity", 
-   "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": "Batch",
+   "depends_on": "eval:doc.based_on == \"Student Group\"",
+   "fieldname": "group_based_on",
+   "fieldtype": "Select",
+   "label": "Group Based On",
+   "options": "Batch\nCourse\nActivity"
+  },
   {
-   "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, 
-   "depends_on": "eval:doc.based_on ==\"Student Group\"", 
-   "fieldname": "student_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": "Student Group", 
-   "length": 0, 
-   "no_copy": 0, 
-   "options": "Student 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
-  }, 
+   "depends_on": "eval:doc.based_on ==\"Student Group\"",
+   "fieldname": "student_group",
+   "fieldtype": "Link",
+   "in_list_view": 1,
+   "label": "Student Group",
+   "options": "Student Group",
+   "reqd": 1
+  },
   {
-   "allow_bulk_edit": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "depends_on": "eval:doc.based_on ==\"Course Schedule\"", 
-   "fieldname": "course_schedule", 
-   "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": "Course Schedule", 
-   "length": 0, 
-   "no_copy": 0, 
-   "options": "Course Schedule", 
-   "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
-  }, 
+   "depends_on": "eval:doc.based_on ==\"Course Schedule\"",
+   "fieldname": "course_schedule",
+   "fieldtype": "Link",
+   "in_list_view": 1,
+   "label": "Course Schedule",
+   "options": "Course Schedule",
+   "reqd": 1
+  },
   {
-   "allow_bulk_edit": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "depends_on": "eval:doc.based_on ==\"Student Group\"", 
-   "fieldname": "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": "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, 
-   "unique": 0
-  }, 
+   "depends_on": "eval:doc.based_on ==\"Student Group\"",
+   "fieldname": "date",
+   "fieldtype": "Date",
+   "in_list_view": 1,
+   "label": "Date",
+   "reqd": 1
+  },
   {
-   "allow_bulk_edit": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "depends_on": "eval: (doc.course_schedule \n|| (doc.student_group && doc.date))", 
-   "fieldname": "attendance", 
-   "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": "Attendance", 
-   "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
-  }, 
+   "depends_on": "eval: (doc.course_schedule \n|| (doc.student_group && doc.date))",
+   "fieldname": "attendance",
+   "fieldtype": "Section Break",
+   "label": "Attendance"
+  },
   {
-   "allow_bulk_edit": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "fieldname": "students_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": "Students HTML", 
-   "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": "students_html",
+   "fieldtype": "HTML",
+   "label": "Students HTML"
+  },
+  {
+   "fetch_from": "student_group.academic_year",
+   "fieldname": "academic_year",
+   "fieldtype": "Link",
+   "label": "Academic Year",
+   "options": "Academic Year",
+   "read_only": 1
+  },
+  {
+   "fetch_from": "student_group.academic_term",
+   "fieldname": "academic_term",
+   "fieldtype": "Link",
+   "label": "Academic Term",
+   "options": "Academic Term",
+   "read_only": 1
   }
- ], 
- "has_web_view": 0, 
- "hide_heading": 1, 
- "hide_toolbar": 1, 
- "idx": 0, 
- "image_view": 0, 
- "in_create": 0, 
- "is_submittable": 0, 
- "issingle": 1, 
- "istable": 0, 
- "max_attachments": 0, 
- "modified": "2017-11-10 18:55:36.168044", 
- "modified_by": "Administrator", 
- "module": "Education", 
- "name": "Student Attendance Tool", 
- "name_case": "", 
- "owner": "Administrator", 
+ ],
+ "hide_toolbar": 1,
+ "issingle": 1,
+ "links": [],
+ "modified": "2020-10-23 17:52:28.078971",
+ "modified_by": "Administrator",
+ "module": "Education",
+ "name": "Student Attendance 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": "Instructor", 
-   "set_user_permissions": 0, 
-   "share": 0, 
-   "submit": 0, 
+   "create": 1,
+   "read": 1,
+   "role": "Instructor",
    "write": 1
-  }, 
+  },
   {
-   "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": "Academics User", 
-   "set_user_permissions": 0, 
-   "share": 0, 
-   "submit": 0, 
+   "create": 1,
+   "read": 1,
+   "role": "Academics User",
    "write": 1
   }
- ], 
- "quick_entry": 0, 
- "read_only": 0, 
- "read_only_onload": 0, 
- "restrict_to_domain": "Education", 
- "show_name_in_global_search": 0, 
- "sort_field": "modified", 
- "sort_order": "DESC", 
- "track_changes": 0, 
- "track_seen": 0
+ ],
+ "restrict_to_domain": "Education",
+ "sort_field": "modified",
+ "sort_order": "DESC"
 }
\ No newline at end of file
diff --git a/erpnext/education/web_form/student_applicant/student_applicant.json b/erpnext/education/web_form/student_applicant/student_applicant.json
index 2be5648..7b4eaa1 100644
--- a/erpnext/education/web_form/student_applicant/student_applicant.json
+++ b/erpnext/education/web_form/student_applicant/student_applicant.json
@@ -70,19 +70,7 @@
    "show_in_filter": 0
   },
   {
-   "allow_read_on_all_link_options": 0,
-   "fieldname": "image",
-   "fieldtype": "Data",
-   "hidden": 0,
-   "label": "Image",
-   "max_length": 0,
-   "max_value": 0,
-   "read_only": 0,
-   "reqd": 0,
-   "show_in_filter": 0
-  },
-  {
-   "allow_read_on_all_link_options": 0,
+   "allow_read_on_all_link_options": 1,
    "fieldname": "program",
    "fieldtype": "Link",
    "hidden": 0,
@@ -95,7 +83,7 @@
    "show_in_filter": 0
   },
   {
-   "allow_read_on_all_link_options": 0,
+   "allow_read_on_all_link_options": 1,
    "fieldname": "academic_year",
    "fieldtype": "Link",
    "hidden": 0,
@@ -108,6 +96,19 @@
    "show_in_filter": 0
   },
   {
+   "allow_read_on_all_link_options": 1,
+   "fieldname": "academic_term",
+   "fieldtype": "Link",
+   "hidden": 0,
+   "label": "Academic Term",
+   "max_length": 0,
+   "max_value": 0,
+   "options": "Academic Term",
+   "read_only": 0,
+   "reqd": 0,
+   "show_in_filter": 0
+  },
+  {
    "allow_read_on_all_link_options": 0,
    "fieldname": "date_of_birth",
    "fieldtype": "Date",
@@ -120,6 +121,19 @@
    "show_in_filter": 0
   },
   {
+   "allow_read_on_all_link_options": 1,
+   "fieldname": "gender",
+   "fieldtype": "Link",
+   "hidden": 0,
+   "label": "Gender",
+   "max_length": 0,
+   "max_value": 0,
+   "options": "Gender",
+   "read_only": 0,
+   "reqd": 0,
+   "show_in_filter": 0
+  },
+  {
    "allow_read_on_all_link_options": 0,
    "fieldname": "blood_group",
    "fieldtype": "Select",
@@ -141,7 +155,7 @@
    "max_length": 0,
    "max_value": 0,
    "read_only": 0,
-   "reqd": 0,
+   "reqd": 1,
    "show_in_filter": 0
   },
   {
@@ -208,19 +222,6 @@
   },
   {
    "allow_read_on_all_link_options": 0,
-   "fieldname": "guardians",
-   "fieldtype": "Table",
-   "hidden": 0,
-   "label": "Guardians",
-   "max_length": 0,
-   "max_value": 0,
-   "options": "Student Guardian",
-   "read_only": 0,
-   "reqd": 0,
-   "show_in_filter": 0
-  },
-  {
-   "allow_read_on_all_link_options": 0,
    "fieldname": "siblings",
    "fieldtype": "Table",
    "hidden": 0,
diff --git a/erpnext/erpnext_integrations/desk_page/erpnext_integrations_settings/erpnext_integrations_settings.json b/erpnext/erpnext_integrations/desk_page/erpnext_integrations_settings/erpnext_integrations_settings.json
new file mode 100644
index 0000000..3bbc36a
--- /dev/null
+++ b/erpnext/erpnext_integrations/desk_page/erpnext_integrations_settings/erpnext_integrations_settings.json
@@ -0,0 +1,30 @@
+{
+ "cards": [
+  {
+   "hidden": 0,
+   "label": "Integrations Settings",
+   "links": "[\n\t{\n\t    \"type\": \"doctype\",\n\t\t\"name\": \"Woocommerce Settings\"\n\t},\n\t{\n\t    \"type\": \"doctype\",\n\t\t\"name\": \"Shopify Settings\",\n\t\t\"description\": \"Connect Shopify with ERPNext\"\n\t},\n\t{\n\t    \"type\": \"doctype\",\n\t\t\"name\": \"Amazon MWS Settings\",\n\t\t\"description\": \"Connect Amazon with ERPNext\"\n\t},\n\t{\n\t\t\"type\": \"doctype\",\n\t\t\"name\": \"Plaid Settings\",\n\t\t\"description\": \"Connect your bank accounts to ERPNext\"\n\t},\n    {\n\t\t\"type\": \"doctype\",\n\t\t\"name\": \"Exotel Settings\",\n\t\t\"description\": \"Connect your Exotel Account to ERPNext and track call logs\"\n    }\n]"
+  }
+ ],
+ "category": "Modules",
+ "charts": [],
+ "creation": "2020-07-31 10:38:54.021237",
+ "developer_mode_only": 0,
+ "disable_user_customization": 0,
+ "docstatus": 0,
+ "doctype": "Desk Page",
+ "extends": "Settings",
+ "extends_another_page": 1,
+ "hide_custom": 0,
+ "idx": 0,
+ "is_standard": 1,
+ "label": "ERPNext Integrations Settings",
+ "modified": "2020-07-31 10:44:39.374297",
+ "modified_by": "Administrator",
+ "module": "ERPNext Integrations",
+ "name": "ERPNext Integrations Settings",
+ "owner": "Administrator",
+ "pin_to_bottom": 0,
+ "pin_to_top": 0,
+ "shortcuts": []
+}
\ No newline at end of file
diff --git a/erpnext/erpnext_integrations/doctype/mpesa_settings/__init__.py b/erpnext/erpnext_integrations/doctype/mpesa_settings/__init__.py
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/erpnext/erpnext_integrations/doctype/mpesa_settings/__init__.py
diff --git a/erpnext/erpnext_integrations/doctype/mpesa_settings/account_balance.html b/erpnext/erpnext_integrations/doctype/mpesa_settings/account_balance.html
new file mode 100644
index 0000000..2c4d4bb
--- /dev/null
+++ b/erpnext/erpnext_integrations/doctype/mpesa_settings/account_balance.html
@@ -0,0 +1,28 @@
+
+{% if not jQuery.isEmptyObject(data) %}
+<h5 style="margin-top: 20px;"> {{ __("Balance Details") }} </h5>
+<table class="table table-bordered small">
+	<thead>
+		<tr>
+			<th style="width: 20%">{{ __("Account Type") }}</th>
+			<th style="width: 20%" class="text-right">{{ __("Current Balance") }}</th>
+			<th style="width: 20%" class="text-right">{{ __("Available Balance") }}</th>
+			<th style="width: 20%" class="text-right">{{ __("Reserved Balance") }}</th>
+			<th style="width: 20%" class="text-right">{{ __("Uncleared Balance") }}</th>
+		</tr>
+	</thead>
+	<tbody>
+		{% for(const [key, value] of Object.entries(data)) { %}
+			<tr>
+				<td> {%= key %} </td>
+				<td class="text-right"> {%= value["current_balance"] %} </td>
+				<td class="text-right"> {%= value["available_balance"] %} </td>
+				<td class="text-right"> {%= value["reserved_balance"] %} </td>
+				<td class="text-right"> {%= value["uncleared_balance"] %} </td>
+			</tr>
+		{% } %}
+	</tbody>
+</table>
+{% else %}
+<p style="margin-top: 30px;"> Account Balance Information Not Available. </p>
+{% endif %}
\ No newline at end of file
diff --git a/erpnext/erpnext_integrations/doctype/mpesa_settings/mpesa_connector.py b/erpnext/erpnext_integrations/doctype/mpesa_settings/mpesa_connector.py
new file mode 100644
index 0000000..d33b0a7
--- /dev/null
+++ b/erpnext/erpnext_integrations/doctype/mpesa_settings/mpesa_connector.py
@@ -0,0 +1,118 @@
+import base64
+import requests
+from requests.auth import HTTPBasicAuth
+import datetime
+
+class MpesaConnector():
+	def __init__(self, env="sandbox", app_key=None, app_secret=None, sandbox_url="https://sandbox.safaricom.co.ke",
+		live_url="https://safaricom.co.ke"):
+		"""Setup configuration for Mpesa connector and generate new access token."""
+		self.env = env
+		self.app_key = app_key
+		self.app_secret = app_secret
+		if env == "sandbox":
+			self.base_url = sandbox_url
+		else:
+			self.base_url = live_url
+		self.authenticate()
+
+	def authenticate(self):
+		"""
+		This method is used to fetch the access token required by Mpesa.
+
+		Returns:
+			access_token (str): This token is to be used with the Bearer header for further API calls to Mpesa.
+		"""
+		authenticate_uri = "/oauth/v1/generate?grant_type=client_credentials"
+		authenticate_url = "{0}{1}".format(self.base_url, authenticate_uri)
+		r = requests.get(
+			authenticate_url,
+			auth=HTTPBasicAuth(self.app_key, self.app_secret)
+		)
+		self.authentication_token = r.json()['access_token']
+		return r.json()['access_token']
+
+	def get_balance(self, initiator=None, security_credential=None, party_a=None, identifier_type=None,
+					remarks=None, queue_timeout_url=None,result_url=None):
+		"""
+		This method uses Mpesa's Account Balance API to to enquire the balance on a M-Pesa BuyGoods (Till Number).
+
+		Args:
+			initiator (str): Username used to authenticate the transaction.
+			security_credential (str): Generate from developer portal.
+			command_id (str): AccountBalance.
+			party_a (int): Till number being queried.
+			identifier_type (int): Type of organization receiving the transaction. (MSISDN/Till Number/Organization short code)
+			remarks (str): Comments that are sent along with the transaction(maximum 100 characters).
+			queue_timeout_url (str): The url that handles information of timed out transactions.
+			result_url (str): The url that receives results from M-Pesa api call.
+
+		Returns:
+			OriginatorConverstionID (str): The unique request ID for tracking a transaction.
+			ConversationID (str): The unique request ID returned by mpesa for each request made
+			ResponseDescription (str): Response Description message
+		"""
+
+		payload = {
+			"Initiator": initiator,
+			"SecurityCredential": security_credential,
+			"CommandID": "AccountBalance",
+			"PartyA": party_a,
+			"IdentifierType": identifier_type,
+			"Remarks": remarks,
+			"QueueTimeOutURL": queue_timeout_url,
+			"ResultURL": result_url
+		}
+		headers = {'Authorization': 'Bearer {0}'.format(self.authentication_token), 'Content-Type': "application/json"}
+		saf_url = "{0}{1}".format(self.base_url, "/mpesa/accountbalance/v1/query")
+		r = requests.post(saf_url, headers=headers, json=payload)
+		return r.json()
+
+	def stk_push(self, business_shortcode=None, passcode=None, amount=None, callback_url=None, reference_code=None,
+				 phone_number=None, description=None):
+		"""
+		This method uses Mpesa's Express API to initiate online payment on behalf of a customer.
+
+		Args:
+			business_shortcode (int): The short code of the organization.
+			passcode (str): Get from developer portal
+			amount (int): The amount being transacted
+			callback_url (str): A CallBack URL is a valid secure URL that is used to receive notifications from M-Pesa API.
+			reference_code(str): Account Reference: This is an Alpha-Numeric parameter that is defined by your system as an Identifier of the transaction for CustomerPayBillOnline transaction type.
+			phone_number(int): The Mobile Number to receive the STK Pin Prompt.
+			description(str): This is any additional information/comment that can be sent along with the request from your system. MAX 13 characters
+
+		Success Response:
+			CustomerMessage(str): Messages that customers can understand.
+			CheckoutRequestID(str): This is a global unique identifier of the processed checkout transaction request.
+			ResponseDescription(str): Describes Success or failure
+			MerchantRequestID(str): This is a global unique Identifier for any submitted payment request.
+			ResponseCode(int): 0 means success all others are error codes. e.g.404.001.03
+
+		Error Reponse:
+			requestId(str): This is a unique requestID for the payment request
+			errorCode(str): This is a predefined code that indicates the reason for request failure.
+			errorMessage(str): This is a predefined code that indicates the reason for request failure.
+		"""
+
+		time = str(datetime.datetime.now()).split(".")[0].replace("-", "").replace(" ", "").replace(":", "")
+		password = "{0}{1}{2}".format(str(business_shortcode), str(passcode), time)
+		encoded = base64.b64encode(bytes(password, encoding='utf8'))
+		payload = {
+			"BusinessShortCode": business_shortcode,
+			"Password": encoded.decode("utf-8"),
+			"Timestamp": time,
+			"TransactionType": "CustomerPayBillOnline",
+			"Amount": amount,
+			"PartyA": int(phone_number),
+			"PartyB": business_shortcode,
+			"PhoneNumber": int(phone_number),
+			"CallBackURL": callback_url,
+			"AccountReference": reference_code,
+			"TransactionDesc": description
+		}
+		headers = {'Authorization': 'Bearer {0}'.format(self.authentication_token), 'Content-Type': "application/json"}
+
+		saf_url = "{0}{1}".format(self.base_url, "/mpesa/stkpush/v1/processrequest")
+		r = requests.post(saf_url, headers=headers, json=payload)
+		return r.json()
\ No newline at end of file
diff --git a/erpnext/erpnext_integrations/doctype/mpesa_settings/mpesa_custom_fields.py b/erpnext/erpnext_integrations/doctype/mpesa_settings/mpesa_custom_fields.py
new file mode 100644
index 0000000..0499e88
--- /dev/null
+++ b/erpnext/erpnext_integrations/doctype/mpesa_settings/mpesa_custom_fields.py
@@ -0,0 +1,53 @@
+import frappe
+from frappe.custom.doctype.custom_field.custom_field import create_custom_fields
+
+def create_custom_pos_fields():
+	"""Create custom fields corresponding to POS Settings and POS Invoice."""
+	pos_field = {
+		"POS Invoice": [
+			{
+				"fieldname": "request_for_payment",
+				"label": "Request for Payment",
+				"fieldtype": "Button",
+				"hidden": 1,
+				"insert_after": "contact_email"
+			},
+			{
+				"fieldname": "mpesa_receipt_number",
+				"label": "Mpesa Receipt Number",
+				"fieldtype": "Data",
+				"read_only": 1,
+				"insert_after": "company"
+			}
+		]
+	}
+	if not frappe.get_meta("POS Invoice").has_field("request_for_payment"):
+		create_custom_fields(pos_field)
+
+	record_dict = [{
+			"doctype": "POS Field",
+			"fieldname": "contact_mobile",
+			"label": "Mobile No",
+			"fieldtype": "Data",
+			"options": "Phone",
+			"parenttype": "POS Settings",
+			"parent": "POS Settings",
+			"parentfield": "invoice_fields"
+		},
+		{
+			"doctype": "POS Field",
+			"fieldname": "request_for_payment",
+			"label": "Request for Payment",
+			"fieldtype": "Button",
+			"parenttype": "POS Settings",
+			"parent": "POS Settings",
+			"parentfield": "invoice_fields"
+		}
+	]
+	create_pos_settings(record_dict)
+
+def create_pos_settings(record_dict):
+	for record in record_dict:
+		if frappe.db.exists("POS Field", {"fieldname": record.get("fieldname")}):
+			continue
+		frappe.get_doc(record).insert()
\ No newline at end of file
diff --git a/erpnext/erpnext_integrations/doctype/mpesa_settings/mpesa_settings.js b/erpnext/erpnext_integrations/doctype/mpesa_settings/mpesa_settings.js
new file mode 100644
index 0000000..636aa99
--- /dev/null
+++ b/erpnext/erpnext_integrations/doctype/mpesa_settings/mpesa_settings.js
@@ -0,0 +1,36 @@
+// Copyright (c) 2020, Frappe Technologies Pvt. Ltd. and contributors
+// For license information, please see license.txt
+
+frappe.ui.form.on('Mpesa Settings', {
+	onload_post_render: function(frm) {
+		frm.events.setup_account_balance_html(frm);
+	},
+
+	refresh: function(frm) {
+		frappe.realtime.on("refresh_mpesa_dashboard", function(){
+			frm.reload_doc();
+		});
+	},
+
+	get_account_balance: function(frm) {
+		if (!frm.initiator_name && !frm.security_credentials) {
+			frappe.throw(__("Please set the initiator name and the security credential"));
+		}
+		frappe.call({
+			method: "get_account_balance_info",
+			doc: frm.doc
+		});
+	},
+
+	setup_account_balance_html: function(frm) {
+		if (!frm.doc.account_balance) return;
+		$("div").remove(".form-dashboard-section.custom");
+		frm.dashboard.add_section(
+			frappe.render_template('account_balance', {
+				data: JSON.parse(frm.doc.account_balance)
+			})
+		);
+		frm.dashboard.show();
+	}
+
+});
diff --git a/erpnext/erpnext_integrations/doctype/mpesa_settings/mpesa_settings.json b/erpnext/erpnext_integrations/doctype/mpesa_settings/mpesa_settings.json
new file mode 100644
index 0000000..fc7b310
--- /dev/null
+++ b/erpnext/erpnext_integrations/doctype/mpesa_settings/mpesa_settings.json
@@ -0,0 +1,135 @@
+{
+ "actions": [],
+ "autoname": "field:payment_gateway_name",
+ "creation": "2020-09-10 13:21:27.398088",
+ "doctype": "DocType",
+ "editable_grid": 1,
+ "engine": "InnoDB",
+ "field_order": [
+  "payment_gateway_name",
+  "consumer_key",
+  "consumer_secret",
+  "initiator_name",
+  "till_number",
+  "sandbox",
+  "column_break_4",
+  "online_passkey",
+  "security_credential",
+  "get_account_balance",
+  "account_balance"
+ ],
+ "fields": [
+  {
+   "fieldname": "payment_gateway_name",
+   "fieldtype": "Data",
+   "label": "Payment Gateway Name",
+   "reqd": 1,
+   "unique": 1
+  },
+  {
+   "fieldname": "consumer_key",
+   "fieldtype": "Data",
+   "in_list_view": 1,
+   "label": "Consumer Key",
+   "reqd": 1
+  },
+  {
+   "fieldname": "consumer_secret",
+   "fieldtype": "Password",
+   "in_list_view": 1,
+   "label": "Consumer Secret",
+   "reqd": 1
+  },
+  {
+   "fieldname": "till_number",
+   "fieldtype": "Data",
+   "in_list_view": 1,
+   "label": "Till Number",
+   "reqd": 1
+  },
+  {
+   "default": "0",
+   "fieldname": "sandbox",
+   "fieldtype": "Check",
+   "label": "Sandbox"
+  },
+  {
+   "fieldname": "column_break_4",
+   "fieldtype": "Column Break"
+  },
+  {
+   "fieldname": "online_passkey",
+   "fieldtype": "Password",
+   "label": " Online PassKey",
+   "reqd": 1
+  },
+  {
+   "fieldname": "initiator_name",
+   "fieldtype": "Data",
+   "label": "Initiator Name"
+  },
+  {
+   "fieldname": "security_credential",
+   "fieldtype": "Small Text",
+   "label": "Security Credential"
+  },
+  {
+   "fieldname": "account_balance",
+   "fieldtype": "Long Text",
+   "hidden": 1,
+   "label": "Account Balance",
+   "read_only": 1
+  },
+  {
+   "fieldname": "get_account_balance",
+   "fieldtype": "Button",
+   "label": "Get Account Balance"
+  }
+ ],
+ "links": [],
+ "modified": "2020-09-25 20:21:38.215494",
+ "modified_by": "Administrator",
+ "module": "ERPNext Integrations",
+ "name": "Mpesa Settings",
+ "owner": "Administrator",
+ "permissions": [
+  {
+   "create": 1,
+   "delete": 1,
+   "email": 1,
+   "export": 1,
+   "print": 1,
+   "read": 1,
+   "report": 1,
+   "role": "System Manager",
+   "share": 1,
+   "write": 1
+  },
+  {
+   "create": 1,
+   "delete": 1,
+   "email": 1,
+   "export": 1,
+   "print": 1,
+   "read": 1,
+   "report": 1,
+   "role": "Accounts Manager",
+   "share": 1,
+   "write": 1
+  },
+  {
+   "create": 1,
+   "delete": 1,
+   "email": 1,
+   "export": 1,
+   "print": 1,
+   "read": 1,
+   "report": 1,
+   "role": "Accounts User",
+   "share": 1,
+   "write": 1
+  }
+ ],
+ "sort_field": "modified",
+ "sort_order": "DESC"
+}
\ No newline at end of file
diff --git a/erpnext/erpnext_integrations/doctype/mpesa_settings/mpesa_settings.py b/erpnext/erpnext_integrations/doctype/mpesa_settings/mpesa_settings.py
new file mode 100644
index 0000000..dea4d81
--- /dev/null
+++ b/erpnext/erpnext_integrations/doctype/mpesa_settings/mpesa_settings.py
@@ -0,0 +1,208 @@
+# -*- coding: utf-8 -*-
+# Copyright (c) 2020, Frappe Technologies and contributors
+# For license information, please see license.txt
+
+
+from __future__ import unicode_literals
+from json import loads, dumps
+
+import frappe
+from frappe.model.document import Document
+from frappe import _
+from frappe.utils import call_hook_method, fmt_money
+from frappe.integrations.utils import create_request_log, create_payment_gateway
+from frappe.utils import get_request_site_address
+from erpnext.erpnext_integrations.utils import create_mode_of_payment
+from erpnext.erpnext_integrations.doctype.mpesa_settings.mpesa_connector import MpesaConnector
+from erpnext.erpnext_integrations.doctype.mpesa_settings.mpesa_custom_fields import create_custom_pos_fields
+
+class MpesaSettings(Document):
+	supported_currencies = ["KES"]
+
+	def validate_transaction_currency(self, currency):
+		if currency not in self.supported_currencies:
+			frappe.throw(_("Please select another payment method. Mpesa does not support transactions in currency '{0}'").format(currency))
+
+	def on_update(self):
+		create_custom_pos_fields()
+		create_payment_gateway('Mpesa-' + self.payment_gateway_name, settings='Mpesa Settings', controller=self.payment_gateway_name)
+		call_hook_method('payment_gateway_enabled', gateway='Mpesa-' + self.payment_gateway_name, payment_channel="Phone")
+
+		# required to fetch the bank account details from the payment gateway account
+		frappe.db.commit()
+		create_mode_of_payment('Mpesa-' + self.payment_gateway_name, payment_type="Phone")
+
+	def request_for_payment(self, **kwargs):
+		if frappe.flags.in_test:
+			from erpnext.erpnext_integrations.doctype.mpesa_settings.test_mpesa_settings import get_payment_request_response_payload
+			response = frappe._dict(get_payment_request_response_payload())
+		else:
+			response = frappe._dict(generate_stk_push(**kwargs))
+
+		self.handle_api_response("CheckoutRequestID", kwargs, response)
+
+	def get_account_balance_info(self):
+		payload = dict(
+			reference_doctype="Mpesa Settings",
+			reference_docname=self.name,
+			doc_details=vars(self)
+		)
+
+		if frappe.flags.in_test:
+			from erpnext.erpnext_integrations.doctype.mpesa_settings.test_mpesa_settings import get_test_account_balance_response
+			response = frappe._dict(get_test_account_balance_response())
+		else:
+			response = frappe._dict(get_account_balance(payload))
+
+		self.handle_api_response("ConversationID", payload, response)
+
+	def handle_api_response(self, global_id, request_dict, response):
+		"""Response received from API calls returns a global identifier for each transaction, this code is returned during the callback."""
+		# check error response
+		if getattr(response, "requestId"):
+			req_name = getattr(response, "requestId")
+			error = response
+		else:
+			# global checkout id used as request name
+			req_name = getattr(response, global_id)
+			error = None
+
+		create_request_log(request_dict, "Host", "Mpesa", req_name, error)
+
+		if error:
+			frappe.throw(_(getattr(response, "errorMessage")), title=_("Transaction Error"))
+
+def generate_stk_push(**kwargs):
+	"""Generate stk push by making a API call to the stk push API."""
+	args = frappe._dict(kwargs)
+	try:
+		callback_url = get_request_site_address(True) + "/api/method/erpnext.erpnext_integrations.doctype.mpesa_settings.mpesa_settings.verify_transaction"
+
+		mpesa_settings = frappe.get_doc("Mpesa Settings", args.payment_gateway[6:])
+		env = "production" if not mpesa_settings.sandbox else "sandbox"
+
+		connector = MpesaConnector(env=env,
+			app_key=mpesa_settings.consumer_key,
+			app_secret=mpesa_settings.get_password("consumer_secret"))
+
+		mobile_number = sanitize_mobile_number(args.sender)
+
+		response = connector.stk_push(business_shortcode=mpesa_settings.till_number,
+			passcode=mpesa_settings.get_password("online_passkey"), amount=args.grand_total,
+			callback_url=callback_url, reference_code=mpesa_settings.till_number,
+			phone_number=mobile_number, description="POS Payment")
+
+		return response
+
+	except Exception:
+		frappe.log_error(title=_("Mpesa Express Transaction Error"))
+		frappe.throw(_("Issue detected with Mpesa configuration, check the error logs for more details"), title=_("Mpesa Express Error"))
+
+def sanitize_mobile_number(number):
+	"""Add country code and strip leading zeroes from the phone number."""
+	return "254" + str(number).lstrip("0")
+
+@frappe.whitelist(allow_guest=True)
+def verify_transaction(**kwargs):
+	"""Verify the transaction result received via callback from stk."""
+	transaction_response = frappe._dict(kwargs["Body"]["stkCallback"])
+
+	checkout_id = getattr(transaction_response, "CheckoutRequestID", "")
+	request = frappe.get_doc("Integration Request", checkout_id)
+	transaction_data = frappe._dict(loads(request.data))
+
+	if transaction_response['ResultCode'] == 0:
+		if request.reference_doctype and request.reference_docname:
+			try:
+				doc = frappe.get_doc(request.reference_doctype,
+					request.reference_docname)
+				doc.run_method("on_payment_authorized", 'Completed')
+
+				item_response = transaction_response["CallbackMetadata"]["Item"]
+				mpesa_receipt = fetch_param_value(item_response, "MpesaReceiptNumber", "Name")
+				frappe.db.set_value("POS Invoice", doc.reference_name, "mpesa_receipt_number", mpesa_receipt)
+				request.handle_success(transaction_response)
+			except Exception:
+				request.handle_failure(transaction_response)
+				frappe.log_error(frappe.get_traceback())
+
+	else:
+		request.handle_failure(transaction_response)
+
+	frappe.publish_realtime('process_phone_payment', doctype="POS Invoice",
+		docname=transaction_data.payment_reference, user=request.owner, message=transaction_response)
+
+def get_account_balance(request_payload):
+	"""Call account balance API to send the request to the Mpesa Servers."""
+	try:
+		mpesa_settings = frappe.get_doc("Mpesa Settings", request_payload.get("reference_docname"))
+		env = "production" if not mpesa_settings.sandbox else "sandbox"
+		connector = MpesaConnector(env=env,
+			app_key=mpesa_settings.consumer_key,
+			app_secret=mpesa_settings.get_password("consumer_secret"))
+
+		callback_url = get_request_site_address(True) + "/api/method/erpnext.erpnext_integrations.doctype.mpesa_settings.mpesa_settings.process_balance_info"
+
+		response = connector.get_balance(mpesa_settings.initiator_name, mpesa_settings.security_credential, mpesa_settings.till_number, 4, mpesa_settings.name, callback_url, callback_url)
+		return response
+	except Exception:
+		frappe.log_error(title=_("Account Balance Processing Error"))
+		frappe.throw(title=_("Error"), message=_("Please check your configuration and try again"))
+
+@frappe.whitelist(allow_guest=True)
+def process_balance_info(**kwargs):
+	"""Process and store account balance information received via callback from the account balance API call."""
+	account_balance_response = frappe._dict(kwargs["Result"])
+
+	conversation_id = getattr(account_balance_response, "ConversationID", "")
+	request = frappe.get_doc("Integration Request", conversation_id)
+
+	if request.status == "Completed":
+		return
+
+	transaction_data = frappe._dict(loads(request.data))
+
+	if account_balance_response["ResultCode"] == 0:
+		try:
+			result_params = account_balance_response["ResultParameters"]["ResultParameter"]
+
+			balance_info = fetch_param_value(result_params, "AccountBalance", "Key")
+			balance_info = format_string_to_json(balance_info)
+
+			ref_doc = frappe.get_doc(transaction_data.reference_doctype, transaction_data.reference_docname)
+			ref_doc.db_set("account_balance", balance_info)
+
+			request.handle_success(account_balance_response)
+			frappe.publish_realtime("refresh_mpesa_dashboard")
+		except Exception:
+			request.handle_failure(account_balance_response)
+			frappe.log_error(title=_("Mpesa Account Balance Processing Error"), message=account_balance_response)
+	else:
+		request.handle_failure(account_balance_response)
+
+def format_string_to_json(balance_info):
+	"""
+	Format string to json.
+
+	e.g: '''Working Account|KES|481000.00|481000.00|0.00|0.00'''
+	=> {'Working Account': {'current_balance': '481000.00',
+		'available_balance': '481000.00',
+		'reserved_balance': '0.00',
+		'uncleared_balance': '0.00'}}
+	"""
+	balance_dict = frappe._dict()
+	for account_info in balance_info.split("&"):
+		account_info = account_info.split('|')
+		balance_dict[account_info[0]] = dict(
+			current_balance=fmt_money(account_info[2], currency="KES"),
+			available_balance=fmt_money(account_info[3], currency="KES"),
+			reserved_balance=fmt_money(account_info[4], currency="KES"),
+			uncleared_balance=fmt_money(account_info[5], currency="KES")
+		)
+	return dumps(balance_dict)
+
+def fetch_param_value(response, key, key_field):
+	"""Fetch the specified key from list of dictionary. Key is identified via the key field."""
+	for param in response:
+		if param[key_field] == key:
+			return param["Value"]
\ No newline at end of file
diff --git a/erpnext/erpnext_integrations/doctype/mpesa_settings/test_mpesa_settings.py b/erpnext/erpnext_integrations/doctype/mpesa_settings/test_mpesa_settings.py
new file mode 100644
index 0000000..4e86d36
--- /dev/null
+++ b/erpnext/erpnext_integrations/doctype/mpesa_settings/test_mpesa_settings.py
@@ -0,0 +1,240 @@
+# -*- coding: utf-8 -*-
+# Copyright (c) 2020, Frappe Technologies Pvt. Ltd. and Contributors
+# See license.txt
+from __future__ import unicode_literals
+from json import dumps
+import frappe
+import unittest
+from erpnext.erpnext_integrations.doctype.mpesa_settings.mpesa_settings import process_balance_info, verify_transaction
+from erpnext.accounts.doctype.pos_invoice.test_pos_invoice import create_pos_invoice
+
+class TestMpesaSettings(unittest.TestCase):
+	def test_creation_of_payment_gateway(self):
+		create_mpesa_settings(payment_gateway_name="_Test")
+
+		mode_of_payment = frappe.get_doc("Mode of Payment", "Mpesa-_Test")
+		self.assertTrue(frappe.db.exists("Payment Gateway Account", {'payment_gateway': "Mpesa-_Test"}))
+		self.assertTrue(mode_of_payment.name)
+		self.assertEquals(mode_of_payment.type, "Phone")
+
+	def test_processing_of_account_balance(self):
+		mpesa_doc = create_mpesa_settings(payment_gateway_name="_Account Balance")
+		mpesa_doc.get_account_balance_info()
+
+		callback_response = get_account_balance_callback_payload()
+		process_balance_info(**callback_response)
+		integration_request = frappe.get_doc("Integration Request", "AG_20200927_00007cdb1f9fb6494315")
+
+		# test integration request creation and successful update of the status on receiving callback response
+		self.assertTrue(integration_request)
+		self.assertEquals(integration_request.status, "Completed")
+
+		# test formatting of account balance received as string to json with appropriate currency symbol
+		mpesa_doc.reload()
+		self.assertEquals(mpesa_doc.account_balance, dumps({
+			"Working Account": {
+				"current_balance": "Sh 481,000.00",
+				"available_balance": "Sh 481,000.00",
+				"reserved_balance": "Sh 0.00",
+				"uncleared_balance": "Sh 0.00"
+			}
+		}))
+
+	def test_processing_of_callback_payload(self):
+		create_mpesa_settings(payment_gateway_name="Payment")
+		mpesa_account = frappe.db.get_value("Payment Gateway Account", {"payment_gateway": 'Mpesa-Payment'}, "payment_account")
+		frappe.db.set_value("Account", mpesa_account, "account_currency", "KES")
+
+		pos_invoice = create_pos_invoice(do_not_submit=1)
+		pos_invoice.append("payments", {'mode_of_payment': 'Mpesa-Payment', 'account': mpesa_account, 'amount': 500})
+		pos_invoice.contact_mobile = "093456543894"
+		pos_invoice.currency = "KES"
+		pos_invoice.save()
+
+		pr = pos_invoice.create_payment_request()
+		# test payment request creation
+		self.assertEquals(pr.payment_gateway, "Mpesa-Payment")
+
+		callback_response = get_payment_callback_payload()
+		verify_transaction(**callback_response)
+		# test creation of integration request
+		integration_request = frappe.get_doc("Integration Request", "ws_CO_061020201133231972")
+
+		# test integration request creation and successful update of the status on receiving callback response
+		self.assertTrue(integration_request)
+		self.assertEquals(integration_request.status, "Completed")
+
+		pos_invoice.reload()
+		integration_request.reload()
+		self.assertEquals(pos_invoice.mpesa_receipt_number, "LGR7OWQX0R")
+		self.assertEquals(integration_request.status, "Completed")
+
+def create_mpesa_settings(payment_gateway_name="Express"):
+	if frappe.db.exists("Mpesa Settings", payment_gateway_name):
+		return frappe.get_doc("Mpesa Settings", payment_gateway_name)
+
+	doc = frappe.get_doc(dict( #nosec
+		doctype="Mpesa Settings",
+		payment_gateway_name=payment_gateway_name,
+		consumer_key="5sMu9LVI1oS3oBGPJfh3JyvLHwZOdTKn",
+		consumer_secret="VI1oS3oBGPJfh3JyvLHw",
+		online_passkey="LVI1oS3oBGPJfh3JyvLHwZOd",
+		till_number="174379"
+	))
+
+	doc.insert(ignore_permissions=True)
+	return doc
+
+def get_test_account_balance_response():
+	"""Response received after calling the account balance API."""
+	return {
+		"ResultType":0,
+		"ResultCode":0,
+		"ResultDesc":"The service request has been accepted successfully.",
+		"OriginatorConversationID":"10816-694520-2",
+		"ConversationID":"AG_20200927_00007cdb1f9fb6494315",
+		"TransactionID":"LGR0000000",
+		"ResultParameters":{
+		"ResultParameter":[
+			{
+			"Key":"ReceiptNo",
+			"Value":"LGR919G2AV"
+			},
+			{
+			"Key":"Conversation ID",
+			"Value":"AG_20170727_00004492b1b6d0078fbe"
+			},
+			{
+			"Key":"FinalisedTime",
+			"Value":20170727101415
+			},
+			{
+			"Key":"Amount",
+			"Value":10
+			},
+			{
+			"Key":"TransactionStatus",
+			"Value":"Completed"
+			},
+			{
+			"Key":"ReasonType",
+			"Value":"Salary Payment via API"
+			},
+			{
+			"Key":"TransactionReason"
+			},
+			{
+			"Key":"DebitPartyCharges",
+			"Value":"Fee For B2C Payment|KES|33.00"
+			},
+			{
+			"Key":"DebitAccountType",
+			"Value":"Utility Account"
+			},
+			{
+			"Key":"InitiatedTime",
+			"Value":20170727101415
+			},
+			{
+			"Key":"Originator Conversation ID",
+			"Value":"19455-773836-1"
+			},
+			{
+			"Key":"CreditPartyName",
+			"Value":"254708374149 - John Doe"
+			},
+			{
+			"Key":"DebitPartyName",
+			"Value":"600134 - Safaricom157"
+			}
+		]
+	},
+	"ReferenceData":{
+	"ReferenceItem":{
+		"Key":"Occasion",
+		"Value":"aaaa"
+	}
+	}
+		}
+
+def get_payment_request_response_payload():
+	"""Response received after successfully calling the stk push process request API."""
+	return {
+		"MerchantRequestID": "8071-27184008-1",
+		"CheckoutRequestID": "ws_CO_061020201133231972",
+		"ResultCode": 0,
+		"ResultDesc": "The service request is processed successfully.",
+		"CallbackMetadata": {
+			"Item": [
+				{ "Name": "Amount", "Value": 500.0 },
+				{ "Name": "MpesaReceiptNumber", "Value": "LGR7OWQX0R" },
+				{ "Name": "TransactionDate", "Value": 20201006113336 },
+				{ "Name": "PhoneNumber", "Value": 254723575670 }
+			]
+		}
+	}
+
+
+def get_payment_callback_payload():
+	"""Response received from the server as callback after calling the stkpush process request API."""
+	return {
+		"Body":{
+		"stkCallback":{
+			"MerchantRequestID":"19465-780693-1",
+			"CheckoutRequestID":"ws_CO_061020201133231972",
+			"ResultCode":0,
+			"ResultDesc":"The service request is processed successfully.",
+			"CallbackMetadata":{
+			"Item":[
+				{
+				"Name":"Amount",
+				"Value":500
+				},
+				{
+				"Name":"MpesaReceiptNumber",
+				"Value":"LGR7OWQX0R"
+				},
+				{
+				"Name":"Balance"
+				},
+				{
+				"Name":"TransactionDate",
+				"Value":20170727154800
+				},
+				{
+				"Name":"PhoneNumber",
+				"Value":254721566839
+				}
+			]
+			}
+		}
+		}
+	}
+
+def get_account_balance_callback_payload():
+	"""Response received from the server as callback after calling the account balance API."""
+	return {
+		"Result":{
+			"ResultType": 0,
+			"ResultCode": 0,
+			"ResultDesc": "The service request is processed successfully.",
+			"OriginatorConversationID": "16470-170099139-1",
+			"ConversationID": "AG_20200927_00007cdb1f9fb6494315",
+			"TransactionID": "OIR0000000",
+			"ResultParameters": {
+				"ResultParameter": [
+					{
+						"Key": "AccountBalance",
+						"Value": "Working Account|KES|481000.00|481000.00|0.00|0.00"
+					},
+					{ "Key": "BOCompletedTime", "Value": 20200927234123 }
+				]
+			},
+			"ReferenceData": {
+				"ReferenceItem": {
+					"Key": "QueueTimeoutURL",
+					"Value": "https://internalsandbox.safaricom.co.ke/mpesa/abresults/v1/submit"
+				}
+			}
+		}
+	}
\ No newline at end of file
diff --git a/erpnext/erpnext_integrations/utils.py b/erpnext/erpnext_integrations/utils.py
index 84f7f5a..e278fd7 100644
--- a/erpnext/erpnext_integrations/utils.py
+++ b/erpnext/erpnext_integrations/utils.py
@@ -3,6 +3,7 @@
 from frappe import _
 import base64, hashlib, hmac
 from six.moves.urllib.parse import urlparse
+from erpnext import get_default_company
 
 def validate_webhooks_request(doctype,  hmac_key, secret_key='secret'):
 	def innerfn(fn):
@@ -41,3 +42,22 @@
 	server_url = '{uri.scheme}://{uri.netloc}/api/method/{endpoint}'.format(uri=urlparse(url), endpoint=endpoint)
 
 	return server_url
+
+def create_mode_of_payment(gateway, payment_type="General"):
+	payment_gateway_account = frappe.db.get_value("Payment Gateway Account", {
+			"payment_gateway": gateway
+		}, ['payment_account'])
+
+	if not frappe.db.exists("Mode of Payment", gateway) and payment_gateway_account:
+		mode_of_payment = frappe.get_doc({
+			"doctype": "Mode of Payment",
+			"mode_of_payment": gateway,
+			"enabled": 1,
+			"type": payment_type,
+			"accounts": [{
+				"doctype": "Mode of Payment Account",
+				"company": get_default_company(),
+				"default_account": payment_gateway_account
+			}]
+		})
+		mode_of_payment.insert(ignore_permissions=True)
\ No newline at end of file
diff --git a/erpnext/healthcare/doctype/drug_prescription/drug_prescription.json b/erpnext/healthcare/doctype/drug_prescription/drug_prescription.json
index 5e4d59c..d91e6bf 100644
--- a/erpnext/healthcare/doctype/drug_prescription/drug_prescription.json
+++ b/erpnext/healthcare/doctype/drug_prescription/drug_prescription.json
@@ -43,7 +43,8 @@
    "ignore_user_permissions": 1,
    "in_list_view": 1,
    "label": "Dosage",
-   "options": "Prescription Dosage"
+   "options": "Prescription Dosage",
+   "reqd": 1
   },
   {
    "fieldname": "period",
@@ -51,14 +52,16 @@
    "ignore_user_permissions": 1,
    "in_list_view": 1,
    "label": "Period",
-   "options": "Prescription Duration"
+   "options": "Prescription Duration",
+   "reqd": 1
   },
   {
    "fieldname": "dosage_form",
    "fieldtype": "Link",
    "ignore_user_permissions": 1,
    "label": "Dosage Form",
-   "options": "Dosage Form"
+   "options": "Dosage Form",
+   "reqd": 1
   },
   {
    "fieldname": "column_break_7",
@@ -72,7 +75,7 @@
    "label": "Comment"
   },
   {
-   "depends_on": "use_interval",
+   "depends_on": "usage_interval",
    "fieldname": "interval",
    "fieldtype": "Int",
    "in_list_view": 1,
@@ -80,6 +83,7 @@
   },
   {
    "default": "1",
+   "depends_on": "usage_interval",
    "fieldname": "update_schedule",
    "fieldtype": "Check",
    "hidden": 1,
@@ -99,12 +103,13 @@
    "default": "0",
    "fieldname": "usage_interval",
    "fieldtype": "Check",
+   "hidden": 1,
    "label": "Dosage by Time Interval"
   }
  ],
  "istable": 1,
  "links": [],
- "modified": "2020-02-26 17:02:42.741338",
+ "modified": "2020-09-30 23:32:09.495288",
  "modified_by": "Administrator",
  "module": "Healthcare",
  "name": "Drug Prescription",
diff --git a/erpnext/healthcare/doctype/inpatient_medication_entry/__init__.py b/erpnext/healthcare/doctype/inpatient_medication_entry/__init__.py
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/erpnext/healthcare/doctype/inpatient_medication_entry/__init__.py
diff --git a/erpnext/healthcare/doctype/inpatient_medication_entry/inpatient_medication_entry.js b/erpnext/healthcare/doctype/inpatient_medication_entry/inpatient_medication_entry.js
new file mode 100644
index 0000000..b953b8a
--- /dev/null
+++ b/erpnext/healthcare/doctype/inpatient_medication_entry/inpatient_medication_entry.js
@@ -0,0 +1,37 @@
+// Copyright (c) 2020, Frappe Technologies Pvt. Ltd. and contributors
+// For license information, please see license.txt
+
+frappe.ui.form.on('Inpatient Medication Entry', {
+	refresh: function(frm) {
+		// Ignore cancellation of doctype on cancel all
+		frm.ignore_doctypes_on_cancel_all = ['Stock Entry'];
+
+		frm.set_query('item_code', () => {
+			return {
+				filters: {
+					is_stock_item: 1
+				}
+			};
+		});
+
+		frm.set_query('drug_code', 'medication_orders', () => {
+			return {
+				filters: {
+					is_stock_item: 1
+				}
+			};
+		});
+	},
+
+	get_medication_orders: function(frm) {
+		frappe.call({
+			method: 'get_medication_orders',
+			doc: frm.doc,
+			freeze: true,
+			freeze_message: __('Fetching Pending Medication Orders'),
+			callback: function() {
+				refresh_field('medication_orders');
+			}
+		});
+	}
+});
diff --git a/erpnext/healthcare/doctype/inpatient_medication_entry/inpatient_medication_entry.json b/erpnext/healthcare/doctype/inpatient_medication_entry/inpatient_medication_entry.json
new file mode 100644
index 0000000..5d80251
--- /dev/null
+++ b/erpnext/healthcare/doctype/inpatient_medication_entry/inpatient_medication_entry.json
@@ -0,0 +1,203 @@
+{
+ "actions": [],
+ "autoname": "naming_series:",
+ "creation": "2020-09-25 14:13:20.111906",
+ "doctype": "DocType",
+ "editable_grid": 1,
+ "engine": "InnoDB",
+ "field_order": [
+  "naming_series",
+  "company",
+  "column_break_3",
+  "posting_date",
+  "status",
+  "filters_section",
+  "item_code",
+  "assigned_to_practitioner",
+  "patient",
+  "practitioner",
+  "service_unit",
+  "column_break_11",
+  "from_date",
+  "to_date",
+  "from_time",
+  "to_time",
+  "select_medication_orders_section",
+  "get_medication_orders",
+  "medication_orders",
+  "section_break_18",
+  "update_stock",
+  "warehouse",
+  "amended_from"
+ ],
+ "fields": [
+  {
+   "fieldname": "naming_series",
+   "fieldtype": "Select",
+   "label": "Naming Series",
+   "options": "HLC-IME-.YYYY.-"
+  },
+  {
+   "fieldname": "company",
+   "fieldtype": "Link",
+   "in_list_view": 1,
+   "in_standard_filter": 1,
+   "label": "Company",
+   "options": "Company",
+   "reqd": 1
+  },
+  {
+   "fieldname": "column_break_3",
+   "fieldtype": "Column Break"
+  },
+  {
+   "fieldname": "posting_date",
+   "fieldtype": "Date",
+   "in_list_view": 1,
+   "in_standard_filter": 1,
+   "label": "Posting Date",
+   "reqd": 1
+  },
+  {
+   "fieldname": "status",
+   "fieldtype": "Select",
+   "label": "Status",
+   "options": "\nDraft\nSubmitted\nPending\nIn Process\nCompleted\nCancelled",
+   "read_only": 1
+  },
+  {
+   "collapsible": 1,
+   "fieldname": "filters_section",
+   "fieldtype": "Section Break",
+   "label": "Filters"
+  },
+  {
+   "fieldname": "item_code",
+   "fieldtype": "Link",
+   "label": "Item Code (Drug)",
+   "options": "Item"
+  },
+  {
+   "depends_on": "update_stock",
+   "description": "Warehouse from where medication stock should be consumed",
+   "fieldname": "warehouse",
+   "fieldtype": "Link",
+   "label": "Medication Warehouse",
+   "mandatory_depends_on": "update_stock",
+   "options": "Warehouse"
+  },
+  {
+   "fieldname": "patient",
+   "fieldtype": "Link",
+   "label": "Patient",
+   "options": "Patient"
+  },
+  {
+   "fieldname": "service_unit",
+   "fieldtype": "Link",
+   "label": "Healthcare Service Unit",
+   "options": "Healthcare Service Unit"
+  },
+  {
+   "fieldname": "column_break_11",
+   "fieldtype": "Column Break"
+  },
+  {
+   "fieldname": "from_date",
+   "fieldtype": "Date",
+   "label": "From Date"
+  },
+  {
+   "fieldname": "to_date",
+   "fieldtype": "Date",
+   "label": "To Date"
+  },
+  {
+   "fieldname": "amended_from",
+   "fieldtype": "Link",
+   "label": "Amended From",
+   "no_copy": 1,
+   "options": "Inpatient Medication Entry",
+   "print_hide": 1,
+   "read_only": 1
+  },
+  {
+   "fieldname": "practitioner",
+   "fieldtype": "Link",
+   "label": "Healthcare Practitioner",
+   "options": "Healthcare Practitioner"
+  },
+  {
+   "fieldname": "select_medication_orders_section",
+   "fieldtype": "Section Break",
+   "label": "Medication Orders"
+  },
+  {
+   "fieldname": "medication_orders",
+   "fieldtype": "Table",
+   "label": "Inpatient Medication Orders",
+   "options": "Inpatient Medication Entry Detail",
+   "read_only": 1,
+   "reqd": 1
+  },
+  {
+   "depends_on": "eval:doc.docstatus!==1",
+   "fieldname": "get_medication_orders",
+   "fieldtype": "Button",
+   "label": "Get Pending Medication Orders",
+   "print_hide": 1
+  },
+  {
+   "fieldname": "assigned_to_practitioner",
+   "fieldtype": "Link",
+   "label": "Assigned To",
+   "options": "User"
+  },
+  {
+   "fieldname": "section_break_18",
+   "fieldtype": "Section Break",
+   "label": "Stock Details"
+  },
+  {
+   "default": "1",
+   "fieldname": "update_stock",
+   "fieldtype": "Check",
+   "label": "Update Stock"
+  },
+  {
+   "fieldname": "from_time",
+   "fieldtype": "Time",
+   "label": "From Time"
+  },
+  {
+   "fieldname": "to_time",
+   "fieldtype": "Time",
+   "label": "To Time"
+  }
+ ],
+ "index_web_pages_for_search": 1,
+ "is_submittable": 1,
+ "links": [],
+ "modified": "2020-09-30 23:40:45.528715",
+ "modified_by": "Administrator",
+ "module": "Healthcare",
+ "name": "Inpatient Medication Entry",
+ "owner": "Administrator",
+ "permissions": [
+  {
+   "create": 1,
+   "delete": 1,
+   "email": 1,
+   "export": 1,
+   "print": 1,
+   "read": 1,
+   "report": 1,
+   "role": "System Manager",
+   "share": 1,
+   "write": 1
+  }
+ ],
+ "sort_field": "modified",
+ "sort_order": "DESC",
+ "track_changes": 1
+}
\ No newline at end of file
diff --git a/erpnext/healthcare/doctype/inpatient_medication_entry/inpatient_medication_entry.py b/erpnext/healthcare/doctype/inpatient_medication_entry/inpatient_medication_entry.py
new file mode 100644
index 0000000..2385893
--- /dev/null
+++ b/erpnext/healthcare/doctype/inpatient_medication_entry/inpatient_medication_entry.py
@@ -0,0 +1,273 @@
+# -*- coding: utf-8 -*-
+# Copyright (c) 2020, Frappe Technologies Pvt. Ltd. and contributors
+# For license information, please see license.txt
+
+from __future__ import unicode_literals
+import frappe
+from frappe import _
+from frappe.model.document import Document
+from frappe.utils import flt, get_link_to_form, getdate, nowtime
+from erpnext.stock.utils import get_latest_stock_qty
+from erpnext.healthcare.doctype.healthcare_settings.healthcare_settings import get_account
+
+class InpatientMedicationEntry(Document):
+	def validate(self):
+		self.validate_medication_orders()
+
+	def get_medication_orders(self):
+		self.validate_datetime_filters()
+
+		# pull inpatient medication orders based on selected filters
+		orders = get_pending_medication_orders(self)
+
+		if orders:
+			self.add_mo_to_table(orders)
+			return self
+		else:
+			self.set('medication_orders', [])
+			frappe.msgprint(_('No pending medication orders found for selected criteria'))
+
+	def validate_datetime_filters(self):
+		if self.from_date and self.to_date:
+			self.validate_from_to_dates('from_date', 'to_date')
+
+		if self.from_date and getdate(self.from_date) > getdate():
+			frappe.throw(_('From Date cannot be after the current date.'))
+
+		if self.to_date and getdate(self.to_date) > getdate():
+			frappe.throw(_('To Date cannot be after the current date.'))
+
+		if self.from_time and self.from_time > nowtime():
+			frappe.throw(_('From Time cannot be after the current time.'))
+
+		if self.to_time and self.to_time > nowtime():
+			frappe.throw(_('To Time cannot be after the current time.'))
+
+	def add_mo_to_table(self, orders):
+		# Add medication orders in the child table
+		self.set('medication_orders', [])
+
+		for data in orders:
+			self.append('medication_orders', {
+				'patient': data.patient,
+				'patient_name': data.patient_name,
+				'inpatient_record': data.inpatient_record,
+				'service_unit': data.service_unit,
+				'datetime': "%s %s" % (data.date, data.time or "00:00:00"),
+				'drug_code': data.drug,
+				'drug_name': data.drug_name,
+				'dosage': data.dosage,
+				'dosage_form': data.dosage_form,
+				'against_imo': data.parent,
+				'against_imoe': data.name
+			})
+
+	def on_submit(self):
+		self.validate_medication_orders()
+		success_msg = ""
+		if self.update_stock:
+			stock_entry = self.process_stock()
+			success_msg += _('Stock Entry {0} created and ').format(
+				frappe.bold(get_link_to_form('Stock Entry', stock_entry)))
+
+		self.update_medication_orders()
+		success_msg += _('Inpatient Medication Orders updated successfully')
+		frappe.msgprint(success_msg, title=_('Success'), indicator='green')
+
+	def validate_medication_orders(self):
+		for entry in self.medication_orders:
+			docstatus, is_completed = frappe.db.get_value('Inpatient Medication Order Entry', entry.against_imoe,
+				['docstatus', 'is_completed'])
+
+			if docstatus == 2:
+				frappe.throw(_('Row {0}: Cannot create Inpatient Medication Entry against cancelled Inpatient Medication Order {1}').format(
+					entry.idx, get_link_to_form(entry.against_imo)))
+
+			if is_completed:
+				frappe.throw(_('Row {0}: This Medication Order is already marked as completed').format(
+					entry.idx))
+
+	def on_cancel(self):
+		self.cancel_stock_entries()
+		self.update_medication_orders(on_cancel=True)
+
+	def process_stock(self):
+		allow_negative_stock = frappe.db.get_single_value('Stock Settings', 'allow_negative_stock')
+		if not allow_negative_stock:
+			self.check_stock_qty()
+
+		return self.make_stock_entry()
+
+	def update_medication_orders(self, on_cancel=False):
+		orders, order_entry_map = self.get_order_entry_map()
+		# mark completion status
+		is_completed = 1
+		if on_cancel:
+			is_completed = 0
+
+		frappe.db.sql("""
+			UPDATE `tabInpatient Medication Order Entry`
+			SET is_completed = %(is_completed)s
+			WHERE name IN %(orders)s
+		""", {'orders': orders, 'is_completed': is_completed})
+
+		# update status and completed orders count
+		for order, count in order_entry_map.items():
+			medication_order = frappe.get_doc('Inpatient Medication Order', order)
+			completed_orders = flt(count)
+			current_value = frappe.db.get_value('Inpatient Medication Order', order, 'completed_orders')
+
+			if on_cancel:
+				completed_orders = flt(current_value) - flt(count)
+			else:
+				completed_orders = flt(current_value) + flt(count)
+
+			medication_order.db_set('completed_orders', completed_orders)
+			medication_order.set_status()
+
+	def get_order_entry_map(self):
+		# for marking order completion status
+		orders = []
+		# orders mapped
+		order_entry_map = dict()
+
+		for entry in self.medication_orders:
+			orders.append(entry.against_imoe)
+			parent = entry.against_imo
+			if not order_entry_map.get(parent):
+				order_entry_map[parent] = 0
+
+			order_entry_map[parent] += 1
+
+		return orders, order_entry_map
+
+	def check_stock_qty(self):
+		from erpnext.stock.stock_ledger import NegativeStockError
+
+		drug_availability = dict()
+		for d in self.medication_orders:
+			if not drug_availability.get(d.drug_code):
+				drug_availability[d.drug_code] = 0
+			drug_availability[d.drug_code] += flt(d.dosage)
+
+		for drug, dosage in drug_availability.items():
+			available_qty = get_latest_stock_qty(drug, self.warehouse)
+
+			# validate qty
+			if flt(available_qty) < flt(dosage):
+				frappe.throw(_('Quantity not available for {0} in warehouse {1}').format(
+					frappe.bold(drug), frappe.bold(self.warehouse))
+					+ '<br><br>' + _('Available quantity is {0}, you need {1}').format(
+					frappe.bold(available_qty), frappe.bold(dosage))
+					+ '<br><br>' + _('Please enable Allow Negative Stock in Stock Settings or create Stock Entry to proceed.'),
+					NegativeStockError, title=_('Insufficient Stock'))
+
+	def make_stock_entry(self):
+		stock_entry = frappe.new_doc('Stock Entry')
+		stock_entry.purpose = 'Material Issue'
+		stock_entry.set_stock_entry_type()
+		stock_entry.from_warehouse = self.warehouse
+		stock_entry.company = self.company
+		stock_entry.inpatient_medication_entry = self.name
+		cost_center = frappe.get_cached_value('Company',  self.company,  'cost_center')
+		expense_account = get_account(None, 'expense_account', 'Healthcare Settings', self.company)
+
+		for entry in self.medication_orders:
+			se_child = stock_entry.append('items')
+			se_child.item_code = entry.drug_code
+			se_child.item_name = entry.drug_name
+			se_child.uom = frappe.db.get_value('Item', entry.drug_code, 'stock_uom')
+			se_child.stock_uom = se_child.uom
+			se_child.qty = flt(entry.dosage)
+			# in stock uom
+			se_child.conversion_factor = 1
+			se_child.cost_center = cost_center
+			se_child.expense_account = expense_account
+			# references
+			se_child.patient = entry.patient
+			se_child.inpatient_medication_entry_child = entry.name
+
+		stock_entry.submit()
+		return stock_entry.name
+
+	def cancel_stock_entries(self):
+		stock_entries = frappe.get_all('Stock Entry', {'inpatient_medication_entry': self.name})
+		for entry in stock_entries:
+			doc = frappe.get_doc('Stock Entry', entry.name)
+			doc.cancel()
+
+
+def get_pending_medication_orders(entry):
+	filters, values = get_filters(entry)
+
+	data = frappe.db.sql("""
+		SELECT
+			ip.inpatient_record, ip.patient, ip.patient_name,
+			entry.name, entry.parent, entry.drug, entry.drug_name,
+			entry.dosage, entry.dosage_form, entry.date, entry.time, entry.instructions
+		FROM
+			`tabInpatient Medication Order` ip
+		INNER JOIN
+			`tabInpatient Medication Order Entry` entry
+		ON
+			ip.name = entry.parent
+		WHERE
+			ip.docstatus = 1 and
+			ip.company = %(company)s and
+			entry.is_completed = 0
+			{0}
+		ORDER BY
+			entry.date, entry.time
+		""".format(filters), values, as_dict=1)
+
+	for doc in data:
+		inpatient_record = doc.inpatient_record
+		doc['service_unit'] = get_current_healthcare_service_unit(inpatient_record)
+
+		if entry.service_unit and doc.service_unit != entry.service_unit:
+			data.remove(doc)
+
+	return data
+
+
+def get_filters(entry):
+	filters = ''
+	values = dict(company=entry.company)
+	if entry.from_date:
+		filters += ' and entry.date >= %(from_date)s'
+		values['from_date'] = entry.from_date
+
+	if entry.to_date:
+		filters += ' and entry.date <= %(to_date)s'
+		values['to_date'] = entry.to_date
+
+	if entry.from_time:
+		filters += ' and entry.time >= %(from_time)s'
+		values['from_time'] = entry.from_time
+
+	if entry.to_time:
+		filters += ' and entry.time <= %(to_time)s'
+		values['to_time'] = entry.to_time
+
+	if entry.patient:
+		filters += ' and ip.patient = %(patient)s'
+		values['patient'] = entry.patient
+
+	if entry.practitioner:
+		filters += ' and ip.practitioner = %(practitioner)s'
+		values['practitioner'] = entry.practitioner
+
+	if entry.item_code:
+		filters += ' and entry.drug = %(item_code)s'
+		values['item_code'] = entry.item_code
+
+	if entry.assigned_to_practitioner:
+		filters += ' and ip._assign LIKE %(assigned_to)s'
+		values['assigned_to'] = '%' + entry.assigned_to_practitioner + '%'
+
+	return filters, values
+
+
+def get_current_healthcare_service_unit(inpatient_record):
+	ip_record = frappe.get_doc('Inpatient Record', inpatient_record)
+	return ip_record.inpatient_occupancies[-1].service_unit
\ No newline at end of file
diff --git a/erpnext/healthcare/doctype/inpatient_medication_entry/inpatient_medication_entry_dashboard.py b/erpnext/healthcare/doctype/inpatient_medication_entry/inpatient_medication_entry_dashboard.py
new file mode 100644
index 0000000..a4bec45
--- /dev/null
+++ b/erpnext/healthcare/doctype/inpatient_medication_entry/inpatient_medication_entry_dashboard.py
@@ -0,0 +1,16 @@
+from __future__ import unicode_literals
+from frappe import _
+
+def get_data():
+	return {
+		'fieldname': 'against_imoe',
+		'internal_links': {
+			'Inpatient Medication Order': ['medication_orders', 'against_imo']
+		},
+		'transactions': [
+			{
+				'label': _('Reference'),
+				'items': ['Inpatient Medication Order']
+			}
+		]
+	}
diff --git a/erpnext/healthcare/doctype/inpatient_medication_entry/test_inpatient_medication_entry.py b/erpnext/healthcare/doctype/inpatient_medication_entry/test_inpatient_medication_entry.py
new file mode 100644
index 0000000..2f1bb6b
--- /dev/null
+++ b/erpnext/healthcare/doctype/inpatient_medication_entry/test_inpatient_medication_entry.py
@@ -0,0 +1,125 @@
+# -*- coding: utf-8 -*-
+# Copyright (c) 2020, Frappe Technologies Pvt. Ltd. and Contributors
+# See license.txt
+from __future__ import unicode_literals
+
+import frappe
+import unittest
+from frappe.utils import add_days, getdate, now_datetime
+from erpnext.healthcare.doctype.inpatient_record.test_inpatient_record import create_patient, create_inpatient, get_healthcare_service_unit, mark_invoiced_inpatient_occupancy
+from erpnext.healthcare.doctype.inpatient_record.inpatient_record import admit_patient, discharge_patient, schedule_discharge
+from erpnext.healthcare.doctype.inpatient_medication_order.test_inpatient_medication_order import create_ipmo, create_ipme
+from erpnext.healthcare.doctype.healthcare_settings.healthcare_settings import get_account
+
+class TestInpatientMedicationEntry(unittest.TestCase):
+	def setUp(self):
+		frappe.db.sql("""delete from `tabInpatient Record`""")
+		frappe.db.sql("""delete from `tabInpatient Medication Order`""")
+		frappe.db.sql("""delete from `tabInpatient Medication Entry`""")
+		self.patient = create_patient()
+
+		# Admit
+		ip_record = create_inpatient(self.patient)
+		ip_record.expected_length_of_stay = 0
+		ip_record.save()
+		ip_record.reload()
+		service_unit = get_healthcare_service_unit()
+		admit_patient(ip_record, service_unit, now_datetime())
+		self.ip_record = ip_record
+
+	def test_filters_for_fetching_pending_mo(self):
+		ipmo = create_ipmo(self.patient)
+		ipmo.submit()
+		ipmo.reload()
+
+		date = add_days(getdate(), -1)
+		filters = frappe._dict(
+			from_date=date,
+			to_date=date,
+			from_time='',
+			to_time='',
+			item_code='Dextromethorphan',
+			patient=self.patient
+		)
+
+		ipme = create_ipme(filters, update_stock=0)
+
+		# 3 dosages per day
+		self.assertEqual(len(ipme.medication_orders), 3)
+		self.assertEqual(getdate(ipme.medication_orders[0].datetime), date)
+
+	def test_ipme_with_stock_update(self):
+		ipmo = create_ipmo(self.patient)
+		ipmo.submit()
+		ipmo.reload()
+
+		date = add_days(getdate(), -1)
+		filters = frappe._dict(
+			from_date=date,
+			to_date=date,
+			from_time='',
+			to_time='',
+			item_code='Dextromethorphan',
+			patient=self.patient
+		)
+
+		make_stock_entry()
+		ipme = create_ipme(filters, update_stock=1)
+		ipme.submit()
+		ipme.reload()
+
+		# test order completed
+		is_order_completed = frappe.db.get_value('Inpatient Medication Order Entry',
+			ipme.medication_orders[0].against_imoe, 'is_completed')
+		self.assertEqual(is_order_completed, 1)
+
+		# test stock entry
+		stock_entry = frappe.db.exists('Stock Entry', {'inpatient_medication_entry': ipme.name})
+		self.assertTrue(stock_entry)
+
+		# check references
+		stock_entry = frappe.get_doc('Stock Entry', stock_entry)
+		self.assertEqual(stock_entry.items[0].patient, self.patient)
+		self.assertEqual(stock_entry.items[0].inpatient_medication_entry_child, ipme.medication_orders[0].name)
+
+	def tearDown(self):
+		# cleanup - Discharge
+		schedule_discharge(frappe.as_json({'patient': self.patient}))
+		self.ip_record.reload()
+		mark_invoiced_inpatient_occupancy(self.ip_record)
+
+		self.ip_record.reload()
+		discharge_patient(self.ip_record)
+
+		for entry in frappe.get_all('Inpatient Medication Entry'):
+			doc = frappe.get_doc('Inpatient Medication Entry', entry.name)
+			doc.cancel()
+			frappe.db.delete('Stock Entry', {'inpatient_medication_entry': doc.name})
+			doc.delete()
+
+		for entry in frappe.get_all('Inpatient Medication Order'):
+			doc = frappe.get_doc('Inpatient Medication Order', entry.name)
+			doc.cancel()
+			doc.delete()
+
+def make_stock_entry():
+	frappe.db.set_value('Company', '_Test Company', {
+		'stock_adjustment_account': 'Stock Adjustment - _TC',
+		'default_inventory_account': 'Stock In Hand - _TC'
+	})
+	stock_entry = frappe.new_doc('Stock Entry')
+	stock_entry.stock_entry_type = 'Material Receipt'
+	stock_entry.company = '_Test Company'
+	stock_entry.to_warehouse = 'Stores - _TC'
+	expense_account = get_account(None, 'expense_account', 'Healthcare Settings', '_Test Company')
+	se_child = stock_entry.append('items')
+	se_child.item_code = 'Dextromethorphan'
+	se_child.item_name = 'Dextromethorphan'
+	se_child.uom = 'Nos'
+	se_child.stock_uom = 'Nos'
+	se_child.qty = 6
+	se_child.t_warehouse = 'Stores - _TC'
+	# in stock uom
+	se_child.conversion_factor = 1.0
+	se_child.expense_account = expense_account
+	stock_entry.submit()
\ No newline at end of file
diff --git a/erpnext/healthcare/doctype/inpatient_medication_entry_detail/__init__.py b/erpnext/healthcare/doctype/inpatient_medication_entry_detail/__init__.py
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/erpnext/healthcare/doctype/inpatient_medication_entry_detail/__init__.py
diff --git a/erpnext/healthcare/doctype/inpatient_medication_entry_detail/inpatient_medication_entry_detail.json b/erpnext/healthcare/doctype/inpatient_medication_entry_detail/inpatient_medication_entry_detail.json
new file mode 100644
index 0000000..e3d7212
--- /dev/null
+++ b/erpnext/healthcare/doctype/inpatient_medication_entry_detail/inpatient_medication_entry_detail.json
@@ -0,0 +1,163 @@
+{
+ "actions": [],
+ "creation": "2020-09-25 14:56:32.636569",
+ "doctype": "DocType",
+ "editable_grid": 1,
+ "engine": "InnoDB",
+ "field_order": [
+  "patient",
+  "patient_name",
+  "inpatient_record",
+  "column_break_4",
+  "service_unit",
+  "datetime",
+  "medication_details_section",
+  "drug_code",
+  "drug_name",
+  "dosage",
+  "available_qty",
+  "dosage_form",
+  "column_break_10",
+  "instructions",
+  "references_section",
+  "against_imo",
+  "against_imoe"
+ ],
+ "fields": [
+  {
+   "columns": 2,
+   "fieldname": "patient",
+   "fieldtype": "Link",
+   "in_list_view": 1,
+   "label": "Patient",
+   "options": "Patient",
+   "reqd": 1
+  },
+  {
+   "fetch_from": "patient.patient_name",
+   "fieldname": "patient_name",
+   "fieldtype": "Data",
+   "label": "Patient Name",
+   "read_only": 1
+  },
+  {
+   "columns": 2,
+   "fieldname": "drug_code",
+   "fieldtype": "Link",
+   "in_list_view": 1,
+   "label": "Drug Code",
+   "options": "Item",
+   "reqd": 1
+  },
+  {
+   "fetch_from": "drug_code.item_name",
+   "fieldname": "drug_name",
+   "fieldtype": "Data",
+   "label": "Drug Name",
+   "read_only": 1
+  },
+  {
+   "columns": 1,
+   "fieldname": "dosage",
+   "fieldtype": "Float",
+   "in_list_view": 1,
+   "label": "Dosage",
+   "reqd": 1
+  },
+  {
+   "fieldname": "dosage_form",
+   "fieldtype": "Link",
+   "label": "Dosage Form",
+   "options": "Dosage Form"
+  },
+  {
+   "fetch_from": "patient.inpatient_record",
+   "fieldname": "inpatient_record",
+   "fieldtype": "Link",
+   "label": "Inpatient Record",
+   "options": "Inpatient Record",
+   "read_only": 1
+  },
+  {
+   "collapsible": 1,
+   "fieldname": "references_section",
+   "fieldtype": "Section Break",
+   "label": "References"
+  },
+  {
+   "fieldname": "column_break_4",
+   "fieldtype": "Column Break"
+  },
+  {
+   "fieldname": "medication_details_section",
+   "fieldtype": "Section Break",
+   "label": "Medication Details"
+  },
+  {
+   "fieldname": "column_break_10",
+   "fieldtype": "Column Break"
+  },
+  {
+   "columns": 3,
+   "fieldname": "datetime",
+   "fieldtype": "Datetime",
+   "in_list_view": 1,
+   "label": "Datetime",
+   "reqd": 1
+  },
+  {
+   "fieldname": "instructions",
+   "fieldtype": "Small Text",
+   "label": "Instructions"
+  },
+  {
+   "columns": 2,
+   "fieldname": "service_unit",
+   "fieldtype": "Link",
+   "in_list_view": 1,
+   "label": "Service Unit",
+   "options": "Healthcare Service Unit",
+   "read_only": 1,
+   "reqd": 1
+  },
+  {
+   "fieldname": "against_imo",
+   "fieldtype": "Link",
+   "label": "Against Inpatient Medication Order",
+   "no_copy": 1,
+   "options": "Inpatient Medication Order",
+   "print_hide": 1,
+   "read_only": 1
+  },
+  {
+   "fieldname": "against_imoe",
+   "fieldtype": "Data",
+   "label": "Against Inpatient Medication Order Entry",
+   "no_copy": 1,
+   "print_hide": 1,
+   "read_only": 1
+  },
+  {
+   "fieldname": "available_qty",
+   "fieldtype": "Float",
+   "hidden": 1,
+   "label": "Available Qty",
+   "no_copy": 1,
+   "print_hide": 1,
+   "read_only": 1
+  }
+ ],
+ "index_web_pages_for_search": 1,
+ "istable": 1,
+ "links": [],
+ "modified": "2020-09-30 14:48:23.648223",
+ "modified_by": "Administrator",
+ "module": "Healthcare",
+ "name": "Inpatient Medication Entry Detail",
+ "owner": "Administrator",
+ "permissions": [],
+ "quick_entry": 1,
+ "sort_field": "modified",
+ "sort_order": "DESC",
+ "track_changes": 1
+}
\ No newline at end of file
diff --git a/erpnext/healthcare/doctype/inpatient_medication_entry_detail/inpatient_medication_entry_detail.py b/erpnext/healthcare/doctype/inpatient_medication_entry_detail/inpatient_medication_entry_detail.py
new file mode 100644
index 0000000..644898d
--- /dev/null
+++ b/erpnext/healthcare/doctype/inpatient_medication_entry_detail/inpatient_medication_entry_detail.py
@@ -0,0 +1,10 @@
+# -*- coding: utf-8 -*-
+# Copyright (c) 2020, Frappe Technologies Pvt. Ltd. and contributors
+# For license information, please see license.txt
+
+from __future__ import unicode_literals
+# import frappe
+from frappe.model.document import Document
+
+class InpatientMedicationEntryDetail(Document):
+	pass
diff --git a/erpnext/healthcare/doctype/inpatient_medication_order/__init__.py b/erpnext/healthcare/doctype/inpatient_medication_order/__init__.py
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/erpnext/healthcare/doctype/inpatient_medication_order/__init__.py
diff --git a/erpnext/healthcare/doctype/inpatient_medication_order/inpatient_medication_order.js b/erpnext/healthcare/doctype/inpatient_medication_order/inpatient_medication_order.js
new file mode 100644
index 0000000..c51f3cf
--- /dev/null
+++ b/erpnext/healthcare/doctype/inpatient_medication_order/inpatient_medication_order.js
@@ -0,0 +1,106 @@
+// Copyright (c) 2020, Frappe Technologies Pvt. Ltd. and contributors
+// For license information, please see license.txt
+
+frappe.ui.form.on('Inpatient Medication Order', {
+	refresh: function(frm) {
+		if (frm.doc.docstatus === 1) {
+			frm.trigger("show_progress");
+		}
+
+		frm.events.show_medication_order_button(frm);
+
+		frm.set_query('patient', () => {
+			return {
+				filters: {
+					'inpatient_record': ['!=', '']
+				}
+			};
+		});
+	},
+
+	show_medication_order_button: function(frm) {
+		frm.fields_dict['medication_orders'].grid.wrapper.find('.grid-add-row').hide();
+		frm.fields_dict['medication_orders'].grid.add_custom_button(__('Add Medication Orders'), () => {
+			let d = new frappe.ui.Dialog({
+				title: __('Add Medication Orders'),
+				fields: [
+					{
+						fieldname: 'drug_code',
+						label: __('Drug'),
+						fieldtype: 'Link',
+						options: 'Item',
+						reqd: 1,
+						"get_query": function () {
+							return {
+								filters: {'is_stock_item': 1}
+							};
+						}
+					},
+					{
+						fieldname: 'dosage',
+						label: __('Dosage'),
+						fieldtype: 'Link',
+						options: 'Prescription Dosage',
+						reqd: 1
+					},
+					{
+						fieldname: 'period',
+						label: __('Period'),
+						fieldtype: 'Link',
+						options: 'Prescription Duration',
+						reqd: 1
+					},
+					{
+						fieldname: 'dosage_form',
+						label: __('Dosage Form'),
+						fieldtype: 'Link',
+						options: 'Dosage Form',
+						reqd: 1
+					}
+				],
+				primary_action_label: __('Add'),
+				primary_action: () => {
+					let values = d.get_values();
+					if (values) {
+						frm.call({
+							doc: frm.doc,
+							method: 'add_order_entries',
+							args: {
+								order: values
+							},
+							freeze: true,
+							freeze_message: __('Adding Order Entries'),
+							callback: function() {
+								frm.refresh_field('medication_orders');
+							}
+						});
+					}
+				},
+			});
+			d.show();
+		});
+	},
+
+	show_progress: function(frm) {
+		let bars = [];
+		let message = '';
+
+		// completed sessions
+		let title = __('{0} medication orders completed', [frm.doc.completed_orders]);
+		if (frm.doc.completed_orders === 1) {
+			title = __('{0} medication order completed', [frm.doc.completed_orders]);
+		}
+		title += __(' out of {0}', [frm.doc.total_orders]);
+
+		bars.push({
+			'title': title,
+			'width': (frm.doc.completed_orders / frm.doc.total_orders * 100) + '%',
+			'progress_class': 'progress-bar-success'
+		});
+		if (bars[0].width == '0%') {
+			bars[0].width = '0.5%';
+		}
+		message = title;
+		frm.dashboard.add_progress(__('Status'), bars, message);
+	}
+});
diff --git a/erpnext/healthcare/doctype/inpatient_medication_order/inpatient_medication_order.json b/erpnext/healthcare/doctype/inpatient_medication_order/inpatient_medication_order.json
new file mode 100644
index 0000000..e31d2e3
--- /dev/null
+++ b/erpnext/healthcare/doctype/inpatient_medication_order/inpatient_medication_order.json
@@ -0,0 +1,196 @@
+{
+ "actions": [],
+ "autoname": "naming_series:",
+ "creation": "2020-09-14 18:33:56.715736",
+ "doctype": "DocType",
+ "editable_grid": 1,
+ "engine": "InnoDB",
+ "field_order": [
+  "patient_details_section",
+  "naming_series",
+  "patient_encounter",
+  "patient",
+  "patient_name",
+  "patient_age",
+  "inpatient_record",
+  "column_break_6",
+  "company",
+  "status",
+  "practitioner",
+  "start_date",
+  "end_date",
+  "medication_orders_section",
+  "medication_orders",
+  "section_break_16",
+  "total_orders",
+  "column_break_18",
+  "completed_orders",
+  "amended_from"
+ ],
+ "fields": [
+  {
+   "fieldname": "patient_details_section",
+   "fieldtype": "Section Break",
+   "label": "Patient Details"
+  },
+  {
+   "fieldname": "naming_series",
+   "fieldtype": "Select",
+   "label": "Naming Series",
+   "options": "HLC-IMO-.YYYY.-"
+  },
+  {
+   "fieldname": "patient_encounter",
+   "fieldtype": "Link",
+   "in_list_view": 1,
+   "label": "Patient Encounter",
+   "options": "Patient Encounter"
+  },
+  {
+   "fetch_from": "patient_encounter.patient",
+   "fieldname": "patient",
+   "fieldtype": "Link",
+   "label": "Patient",
+   "options": "Patient",
+   "read_only_depends_on": "patient_encounter",
+   "reqd": 1
+  },
+  {
+   "fetch_from": "patient.patient_name",
+   "fieldname": "patient_name",
+   "fieldtype": "Data",
+   "label": "Patient Name",
+   "read_only": 1
+  },
+  {
+   "fieldname": "patient_age",
+   "fieldtype": "Data",
+   "label": "Patient Age",
+   "read_only": 1
+  },
+  {
+   "fieldname": "column_break_6",
+   "fieldtype": "Column Break"
+  },
+  {
+   "fetch_from": "patient.inpatient_record",
+   "fieldname": "inpatient_record",
+   "fieldtype": "Link",
+   "in_list_view": 1,
+   "label": "Inpatient Record",
+   "options": "Inpatient Record",
+   "read_only": 1,
+   "reqd": 1
+  },
+  {
+   "fetch_from": "patient_encounter.practitioner",
+   "fieldname": "practitioner",
+   "fieldtype": "Link",
+   "in_list_view": 1,
+   "label": "Healthcare Practitioner",
+   "options": "Healthcare Practitioner",
+   "read_only_depends_on": "patient_encounter"
+  },
+  {
+   "fieldname": "start_date",
+   "fieldtype": "Date",
+   "in_list_view": 1,
+   "label": "Start Date",
+   "reqd": 1
+  },
+  {
+   "fieldname": "end_date",
+   "fieldtype": "Date",
+   "label": "End Date",
+   "read_only": 1
+  },
+  {
+   "depends_on": "eval: doc.patient && doc.start_date",
+   "fieldname": "medication_orders_section",
+   "fieldtype": "Section Break",
+   "label": "Medication Orders"
+  },
+  {
+   "fieldname": "medication_orders",
+   "fieldtype": "Table",
+   "label": "Medication Orders",
+   "options": "Inpatient Medication Order Entry"
+  },
+  {
+   "fieldname": "company",
+   "fieldtype": "Link",
+   "label": "Company",
+   "options": "Company",
+   "reqd": 1
+  },
+  {
+   "fieldname": "amended_from",
+   "fieldtype": "Link",
+   "label": "Amended From",
+   "no_copy": 1,
+   "options": "Inpatient Medication Order",
+   "print_hide": 1,
+   "read_only": 1
+  },
+  {
+   "fieldname": "status",
+   "fieldtype": "Select",
+   "in_list_view": 1,
+   "in_standard_filter": 1,
+   "label": "Status",
+   "options": "\nDraft\nSubmitted\nPending\nIn Process\nCompleted\nCancelled",
+   "read_only": 1
+  },
+  {
+   "collapsible": 1,
+   "fieldname": "section_break_16",
+   "fieldtype": "Section Break",
+   "label": "Other Details"
+  },
+  {
+   "fieldname": "total_orders",
+   "fieldtype": "Float",
+   "label": "Total Orders",
+   "no_copy": 1,
+   "read_only": 1
+  },
+  {
+   "fieldname": "column_break_18",
+   "fieldtype": "Column Break"
+  },
+  {
+   "fieldname": "completed_orders",
+   "fieldtype": "Float",
+   "label": "Completed Orders",
+   "no_copy": 1,
+   "read_only": 1
+  }
+ ],
+ "index_web_pages_for_search": 1,
+ "is_submittable": 1,
+ "links": [],
+ "modified": "2020-09-30 21:53:27.128591",
+ "modified_by": "Administrator",
+ "module": "Healthcare",
+ "name": "Inpatient Medication Order",
+ "owner": "Administrator",
+ "permissions": [
+  {
+   "create": 1,
+   "delete": 1,
+   "email": 1,
+   "export": 1,
+   "print": 1,
+   "read": 1,
+   "report": 1,
+   "role": "System Manager",
+   "share": 1,
+   "write": 1
+  }
+ ],
+ "search_fields": "patient_encounter, patient",
+ "sort_field": "modified",
+ "sort_order": "DESC",
+ "title_field": "patient",
+ "track_changes": 1
+}
\ No newline at end of file
diff --git a/erpnext/healthcare/doctype/inpatient_medication_order/inpatient_medication_order.py b/erpnext/healthcare/doctype/inpatient_medication_order/inpatient_medication_order.py
new file mode 100644
index 0000000..33cbbec
--- /dev/null
+++ b/erpnext/healthcare/doctype/inpatient_medication_order/inpatient_medication_order.py
@@ -0,0 +1,74 @@
+# -*- coding: utf-8 -*-
+# Copyright (c) 2020, Frappe Technologies Pvt. Ltd. and contributors
+# For license information, please see license.txt
+
+from __future__ import unicode_literals
+import frappe
+from frappe import _
+from frappe.model.document import Document
+from frappe.utils import cstr
+from erpnext.healthcare.doctype.patient_encounter.patient_encounter import get_prescription_dates
+
+class InpatientMedicationOrder(Document):
+	def validate(self):
+		self.validate_inpatient()
+		self.validate_duplicate()
+		self.set_total_orders()
+		self.set_status()
+
+	def on_submit(self):
+		self.validate_inpatient()
+		self.set_status()
+
+	def on_cancel(self):
+		self.set_status()
+
+	def validate_inpatient(self):
+		if not self.inpatient_record:
+			frappe.throw(_('No Inpatient Record found against patient {0}').format(self.patient))
+
+	def validate_duplicate(self):
+		existing_mo = frappe.db.exists('Inpatient Medication Order', {
+			'patient_encounter': self.patient_encounter,
+			'docstatus': ('!=', 2),
+			'name': ('!=', self.name)
+		})
+		if existing_mo:
+			frappe.throw(_('An Inpatient Medication Order {0} against Patient Encounter {1} already exists.').format(
+				existing_mo, self.patient_encounter), frappe.DuplicateEntryError)
+
+	def set_total_orders(self):
+		self.db_set('total_orders', len(self.medication_orders))
+
+	def set_status(self):
+		status = {
+			"0": "Draft",
+			"1": "Submitted",
+			"2": "Cancelled"
+		}[cstr(self.docstatus or 0)]
+
+		if self.docstatus == 1:
+			if not self.completed_orders:
+				status = 'Pending'
+			elif self.completed_orders < self.total_orders:
+				status = 'In Process'
+			else:
+				status = 'Completed'
+
+		self.db_set('status', status)
+
+	def add_order_entries(self, order):
+		if order.get('drug_code'):
+			dosage = frappe.get_doc('Prescription Dosage', order.get('dosage'))
+			dates = get_prescription_dates(order.get('period'), self.start_date)
+			for date in dates:
+				for dose in dosage.dosage_strength:
+					entry = self.append('medication_orders')
+					entry.drug = order.get('drug_code')
+					entry.drug_name = frappe.db.get_value('Item', order.get('drug_code'), 'item_name')
+					entry.dosage = dose.strength
+					entry.dosage_form = order.get('dosage_form')
+					entry.date = date
+					entry.time = dose.strength_time
+			self.end_date = dates[-1]
+		return
diff --git a/erpnext/healthcare/doctype/inpatient_medication_order/inpatient_medication_order_list.js b/erpnext/healthcare/doctype/inpatient_medication_order/inpatient_medication_order_list.js
new file mode 100644
index 0000000..1c31876
--- /dev/null
+++ b/erpnext/healthcare/doctype/inpatient_medication_order/inpatient_medication_order_list.js
@@ -0,0 +1,16 @@
+frappe.listview_settings['Inpatient Medication Order'] = {
+	add_fields: ["status"],
+	filters: [["status", "!=", "Cancelled"]],
+	get_indicator: function(doc) {
+		if (doc.status === "Pending") {
+			return [__("Pending"), "orange", "status,=,Pending"];
+
+		} else if (doc.status === "In Process") {
+			return [__("In Process"), "blue", "status,=,In Process"];
+
+		} else if (doc.status === "Completed") {
+			return [__("Completed"), "green", "status,=,Completed"];
+
+		}
+	}
+};
diff --git a/erpnext/healthcare/doctype/inpatient_medication_order/test_inpatient_medication_order.py b/erpnext/healthcare/doctype/inpatient_medication_order/test_inpatient_medication_order.py
new file mode 100644
index 0000000..a21caca
--- /dev/null
+++ b/erpnext/healthcare/doctype/inpatient_medication_order/test_inpatient_medication_order.py
@@ -0,0 +1,150 @@
+# -*- coding: utf-8 -*-
+# Copyright (c) 2020, Frappe Technologies Pvt. Ltd. and Contributors
+# See license.txt
+from __future__ import unicode_literals
+
+import frappe
+import unittest
+from frappe.utils import add_days, getdate, now_datetime
+from erpnext.healthcare.doctype.inpatient_record.test_inpatient_record import create_patient, create_inpatient, get_healthcare_service_unit, mark_invoiced_inpatient_occupancy
+from erpnext.healthcare.doctype.inpatient_record.inpatient_record import admit_patient, discharge_patient, schedule_discharge
+
+class TestInpatientMedicationOrder(unittest.TestCase):
+	def setUp(self):
+		frappe.db.sql("""delete from `tabInpatient Record`""")
+		self.patient = create_patient()
+
+		# Admit
+		ip_record = create_inpatient(self.patient)
+		ip_record.expected_length_of_stay = 0
+		ip_record.save()
+		ip_record.reload()
+		service_unit = get_healthcare_service_unit()
+		admit_patient(ip_record, service_unit, now_datetime())
+		self.ip_record = ip_record
+
+	def test_order_creation(self):
+		ipmo = create_ipmo(self.patient)
+		ipmo.submit()
+		ipmo.reload()
+
+		# 3 dosages per day for 2 days
+		self.assertEqual(len(ipmo.medication_orders), 6)
+		self.assertEqual(ipmo.medication_orders[0].date, add_days(getdate(), -1))
+
+		prescription_dosage = frappe.get_doc('Prescription Dosage', '1-1-1')
+		for i in range(len(prescription_dosage.dosage_strength)):
+			self.assertEqual(ipmo.medication_orders[i].time, prescription_dosage.dosage_strength[i].strength_time)
+
+		self.assertEqual(ipmo.medication_orders[3].date, getdate())
+
+	def test_inpatient_validation(self):
+		# Discharge
+		schedule_discharge(frappe.as_json({'patient': self.patient}))
+
+		self.ip_record.reload()
+		mark_invoiced_inpatient_occupancy(self.ip_record)
+
+		self.ip_record.reload()
+		discharge_patient(self.ip_record)
+
+		ipmo = create_ipmo(self.patient)
+		# inpatient validation
+		self.assertRaises(frappe.ValidationError, ipmo.insert)
+
+	def test_status(self):
+		ipmo = create_ipmo(self.patient)
+		ipmo.submit()
+		ipmo.reload()
+
+		self.assertEqual(ipmo.status, 'Pending')
+
+		filters = frappe._dict(from_date=add_days(getdate(), -1), to_date=add_days(getdate(), -1), from_time='', to_time='')
+		ipme = create_ipme(filters)
+		ipme.submit()
+		ipmo.reload()
+		self.assertEqual(ipmo.status, 'In Process')
+
+		filters = frappe._dict(from_date=getdate(), to_date=getdate(), from_time='', to_time='')
+		ipme = create_ipme(filters)
+		ipme.submit()
+		ipmo.reload()
+		self.assertEqual(ipmo.status, 'Completed')
+
+	def tearDown(self):
+		if frappe.db.get_value('Patient', self.patient, 'inpatient_record'):
+			# cleanup - Discharge
+			schedule_discharge(frappe.as_json({'patient': self.patient}))
+			self.ip_record.reload()
+			mark_invoiced_inpatient_occupancy(self.ip_record)
+
+			self.ip_record.reload()
+			discharge_patient(self.ip_record)
+
+		for entry in frappe.get_all('Inpatient Medication Entry'):
+			doc = frappe.get_doc('Inpatient Medication Entry', entry.name)
+			doc.cancel()
+			doc.delete()
+
+		for entry in frappe.get_all('Inpatient Medication Order'):
+			doc = frappe.get_doc('Inpatient Medication Order', entry.name)
+			doc.cancel()
+			doc.delete()
+
+def create_dosage_form():
+	if not frappe.db.exists('Dosage Form', 'Tablet'):
+		frappe.get_doc({
+			'doctype': 'Dosage Form',
+			'dosage_form': 'Tablet'
+		}).insert()
+
+def create_drug(item=None):
+	if not item:
+		item = 'Dextromethorphan'
+	drug = frappe.db.exists('Item', {'item_code': 'Dextromethorphan'})
+	if not drug:
+		drug = frappe.get_doc({
+			'doctype': 'Item',
+			'item_code': 'Dextromethorphan',
+			'item_name': 'Dextromethorphan',
+			'item_group': 'Products',
+			'stock_uom': 'Nos',
+			'is_stock_item': 1,
+			'valuation_rate': 50,
+			'opening_stock': 20
+		}).insert()
+
+def get_orders():
+	create_dosage_form()
+	create_drug()
+	return {
+		'drug_code': 'Dextromethorphan',
+		'drug_name': 'Dextromethorphan',
+		'dosage': '1-1-1',
+		'dosage_form': 'Tablet',
+		'period': '2 Day'
+	}
+
+def create_ipmo(patient):
+	orders = get_orders()
+	ipmo = frappe.new_doc('Inpatient Medication Order')
+	ipmo.patient = patient
+	ipmo.company = '_Test Company'
+	ipmo.start_date = add_days(getdate(), -1)
+	ipmo.add_order_entries(orders)
+
+	return ipmo
+
+def create_ipme(filters, update_stock=0):
+	ipme = frappe.new_doc('Inpatient Medication Entry')
+	ipme.company = '_Test Company'
+	ipme.posting_date = getdate()
+	ipme.update_stock = update_stock
+	if update_stock:
+		ipme.warehouse = 'Stores - _TC'
+	for key, value in filters.items():
+		ipme.set(key, value)
+	ipme = ipme.get_medication_orders()
+
+	return ipme
+
diff --git a/erpnext/healthcare/doctype/inpatient_medication_order_entry/__init__.py b/erpnext/healthcare/doctype/inpatient_medication_order_entry/__init__.py
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/erpnext/healthcare/doctype/inpatient_medication_order_entry/__init__.py
diff --git a/erpnext/healthcare/doctype/inpatient_medication_order_entry/inpatient_medication_order_entry.json b/erpnext/healthcare/doctype/inpatient_medication_order_entry/inpatient_medication_order_entry.json
new file mode 100644
index 0000000..72999a9
--- /dev/null
+++ b/erpnext/healthcare/doctype/inpatient_medication_order_entry/inpatient_medication_order_entry.json
@@ -0,0 +1,94 @@
+{
+ "actions": [],
+ "creation": "2020-09-14 21:51:30.259164",
+ "doctype": "DocType",
+ "editable_grid": 1,
+ "engine": "InnoDB",
+ "field_order": [
+  "drug",
+  "drug_name",
+  "dosage",
+  "dosage_form",
+  "instructions",
+  "column_break_4",
+  "date",
+  "time",
+  "is_completed"
+ ],
+ "fields": [
+  {
+   "fieldname": "drug",
+   "fieldtype": "Link",
+   "in_list_view": 1,
+   "label": "Drug",
+   "options": "Item",
+   "reqd": 1
+  },
+  {
+   "fetch_from": "drug.item_name",
+   "fieldname": "drug_name",
+   "fieldtype": "Data",
+   "label": "Drug Name",
+   "read_only": 1
+  },
+  {
+   "fieldname": "dosage",
+   "fieldtype": "Float",
+   "in_list_view": 1,
+   "label": "Dosage",
+   "reqd": 1
+  },
+  {
+   "fieldname": "dosage_form",
+   "fieldtype": "Link",
+   "in_list_view": 1,
+   "label": "Dosage Form",
+   "options": "Dosage Form",
+   "reqd": 1
+  },
+  {
+   "fieldname": "column_break_4",
+   "fieldtype": "Column Break"
+  },
+  {
+   "fieldname": "date",
+   "fieldtype": "Date",
+   "in_list_view": 1,
+   "label": "Date",
+   "reqd": 1
+  },
+  {
+   "fieldname": "time",
+   "fieldtype": "Time",
+   "in_list_view": 1,
+   "label": "Time",
+   "reqd": 1
+  },
+  {
+   "default": "0",
+   "fieldname": "is_completed",
+   "fieldtype": "Check",
+   "label": "Is Order Completed",
+   "no_copy": 1,
+   "read_only": 1
+  },
+  {
+   "fieldname": "instructions",
+   "fieldtype": "Small Text",
+   "label": "Instructions"
+  }
+ ],
+ "index_web_pages_for_search": 1,
+ "istable": 1,
+ "links": [],
+ "modified": "2020-09-30 14:03:26.755925",
+ "modified_by": "Administrator",
+ "module": "Healthcare",
+ "name": "Inpatient Medication Order Entry",
+ "owner": "Administrator",
+ "permissions": [],
+ "quick_entry": 1,
+ "sort_field": "modified",
+ "sort_order": "DESC",
+ "track_changes": 1
+}
\ No newline at end of file
diff --git a/erpnext/healthcare/doctype/inpatient_medication_order_entry/inpatient_medication_order_entry.py b/erpnext/healthcare/doctype/inpatient_medication_order_entry/inpatient_medication_order_entry.py
new file mode 100644
index 0000000..ebfe366
--- /dev/null
+++ b/erpnext/healthcare/doctype/inpatient_medication_order_entry/inpatient_medication_order_entry.py
@@ -0,0 +1,10 @@
+# -*- coding: utf-8 -*-
+# Copyright (c) 2020, Frappe Technologies Pvt. Ltd. and contributors
+# For license information, please see license.txt
+
+from __future__ import unicode_literals
+# import frappe
+from frappe.model.document import Document
+
+class InpatientMedicationOrderEntry(Document):
+	pass
diff --git a/erpnext/healthcare/doctype/inpatient_record/test_inpatient_record.py b/erpnext/healthcare/doctype/inpatient_record/test_inpatient_record.py
index 2bef5fb..70706ad 100644
--- a/erpnext/healthcare/doctype/inpatient_record/test_inpatient_record.py
+++ b/erpnext/healthcare/doctype/inpatient_record/test_inpatient_record.py
@@ -83,6 +83,7 @@
 	if not service_unit:
 		service_unit = frappe.new_doc("Healthcare Service Unit")
 		service_unit.healthcare_service_unit_name = "Test Service Unit Ip Occupancy"
+		service_unit.company = "_Test Company"
 		service_unit.service_unit_type = get_service_unit_type()
 		service_unit.inpatient_occupancy = 1
 		service_unit.occupancy_status = "Vacant"
diff --git a/erpnext/healthcare/doctype/patient_encounter/patient_encounter.js b/erpnext/healthcare/doctype/patient_encounter/patient_encounter.js
index 6353d19..e960f0a 100644
--- a/erpnext/healthcare/doctype/patient_encounter/patient_encounter.js
+++ b/erpnext/healthcare/doctype/patient_encounter/patient_encounter.js
@@ -58,6 +58,14 @@
 				create_procedure(frm);
 			},'Create');
 
+			if (frm.doc.drug_prescription && frm.doc.inpatient_record && frm.doc.inpatient_status === "Admitted") {
+				frm.add_custom_button(__('Inpatient Medication Order'), function() {
+					frappe.model.open_mapped_doc({
+						method: 'erpnext.healthcare.doctype.patient_encounter.patient_encounter.make_ip_medication_order',
+						frm: frm
+					});
+				}, 'Create');
+			}
 		}
 
 		frm.set_query('patient', function() {
diff --git a/erpnext/healthcare/doctype/patient_encounter/patient_encounter.py b/erpnext/healthcare/doctype/patient_encounter/patient_encounter.py
index 262fc46..87f4249 100644
--- a/erpnext/healthcare/doctype/patient_encounter/patient_encounter.py
+++ b/erpnext/healthcare/doctype/patient_encounter/patient_encounter.py
@@ -6,8 +6,9 @@
 import frappe
 from frappe import _
 from frappe.model.document import Document
-from frappe.utils import cstr
+from frappe.utils import cstr, getdate, add_days
 from frappe import _
+from frappe.model.mapper import get_mapped_doc
 
 class PatientEncounter(Document):
 	def validate(self):
@@ -22,20 +23,69 @@
 		insert_encounter_to_medical_record(self)
 
 	def on_submit(self):
-		update_encounter_medical_record(self)
+		if self.therapies:
+			create_therapy_plan(self)
 
 	def on_cancel(self):
 		if self.appointment:
 			frappe.db.set_value('Patient Appointment', self.appointment, 'status', 'Open')
-		delete_medical_record(self)
 
-	def on_submit(self):
-		create_therapy_plan(self)
+		if self.inpatient_record and self.drug_prescription:
+			delete_ip_medication_order(self)
+
+		delete_medical_record(self)
 
 	def set_title(self):
 		self.title = _('{0} with {1}').format(self.patient_name or self.patient,
 			self.practitioner_name or self.practitioner)[:100]
 
+@frappe.whitelist()
+def make_ip_medication_order(source_name, target_doc=None):
+	def set_missing_values(source, target):
+		target.start_date = source.encounter_date
+		for entry in source.drug_prescription:
+			if entry.drug_code:
+				dosage = frappe.get_doc('Prescription Dosage', entry.dosage)
+				dates = get_prescription_dates(entry.period, target.start_date)
+				for date in dates:
+					for dose in dosage.dosage_strength:
+						order = target.append('medication_orders')
+						order.drug = entry.drug_code
+						order.drug_name = entry.drug_name
+						order.dosage = dose.strength
+						order.instructions = entry.comment
+						order.dosage_form = entry.dosage_form
+						order.date = date
+						order.time = dose.strength_time
+				target.end_date = dates[-1]
+
+	doc = get_mapped_doc('Patient Encounter', source_name, {
+			'Patient Encounter': {
+				'doctype': 'Inpatient Medication Order',
+				'field_map': {
+					'name': 'patient_encounter',
+					'patient': 'patient',
+					'patient_name': 'patient_name',
+					'patient_age': 'patient_age',
+					'inpatient_record': 'inpatient_record',
+					'practitioner': 'practitioner',
+					'start_date': 'encounter_date'
+				},
+			}
+		}, target_doc, set_missing_values)
+
+	return doc
+
+
+def get_prescription_dates(period, start_date):
+	prescription_duration = frappe.get_doc('Prescription Duration', period)
+	days = prescription_duration.get_days()
+	dates = [start_date]
+	for i in range(1, days):
+		dates.append(add_days(getdate(start_date), i))
+	return dates
+
+
 def create_therapy_plan(encounter):
 	if len(encounter.therapies):
 		doc = frappe.new_doc('Therapy Plan')
@@ -51,6 +101,7 @@
 			encounter.db_set('therapy_plan', doc.name)
 			frappe.msgprint(_('Therapy Plan {0} created successfully.').format(frappe.bold(doc.name)), alert=True)
 
+
 def insert_encounter_to_medical_record(doc):
 	subject = set_subject_field(doc)
 	medical_record = frappe.new_doc('Patient Medical Record')
@@ -63,6 +114,7 @@
 	medical_record.reference_owner = doc.owner
 	medical_record.save(ignore_permissions=True)
 
+
 def update_encounter_medical_record(encounter):
 	medical_record_id = frappe.db.exists('Patient Medical Record', {'reference_name': encounter.name})
 
@@ -72,8 +124,17 @@
 	else:
 		insert_encounter_to_medical_record(encounter)
 
+
 def delete_medical_record(encounter):
-	frappe.delete_doc_if_exists('Patient Medical Record', 'reference_name', encounter.name)
+	record = frappe.db.exists('Patient Medical Record', {'reference_name', encounter.name})
+	if record:
+		frappe.delete_doc('Patient Medical Record', record, force=1)
+
+def delete_ip_medication_order(encounter):
+	record = frappe.db.exists('Inpatient Medication Order', {'patient_encounter': encounter.name})
+	if record:
+		frappe.delete_doc('Inpatient Medication Order', record, force=1)
+
 
 def set_subject_field(encounter):
 	subject = frappe.bold(_('Healthcare Practitioner: ')) + encounter.practitioner + '<br>'
diff --git a/erpnext/healthcare/doctype/patient_encounter/patient_encounter_dashboard.py b/erpnext/healthcare/doctype/patient_encounter/patient_encounter_dashboard.py
index b08b172..39e54f5 100644
--- a/erpnext/healthcare/doctype/patient_encounter/patient_encounter_dashboard.py
+++ b/erpnext/healthcare/doctype/patient_encounter/patient_encounter_dashboard.py
@@ -5,12 +5,18 @@
 	return {
 		'fieldname': 'encounter',
 		'non_standard_fieldnames': {
-			'Patient Medical Record': 'reference_name'
+			'Patient Medical Record': 'reference_name',
+			'Inpatient Medication Order': 'patient_encounter'
 		},
 		'transactions': [
 			{
 				'label': _('Records'),
 				'items': ['Vital Signs', 'Patient Medical Record']
 			},
-		]
+			{
+				'label': _('Orders'),
+				'items': ['Inpatient Medication Order']
+			}
+		],
+		'disable_create_buttons': ['Inpatient Medication Order']
 	}
diff --git a/erpnext/healthcare/doctype/therapy_plan/test_therapy_plan.py b/erpnext/healthcare/doctype/therapy_plan/test_therapy_plan.py
index 526bb95..a061c66 100644
--- a/erpnext/healthcare/doctype/therapy_plan/test_therapy_plan.py
+++ b/erpnext/healthcare/doctype/therapy_plan/test_therapy_plan.py
@@ -5,9 +5,9 @@
 
 import frappe
 import unittest
-from frappe.utils import getdate
+from frappe.utils import getdate, flt
 from erpnext.healthcare.doctype.therapy_type.test_therapy_type import create_therapy_type
-from erpnext.healthcare.doctype.therapy_plan.therapy_plan import make_therapy_session
+from erpnext.healthcare.doctype.therapy_plan.therapy_plan import make_therapy_session, make_sales_invoice
 from erpnext.healthcare.doctype.patient_appointment.test_patient_appointment import create_healthcare_docs, create_patient
 
 class TestTherapyPlan(unittest.TestCase):
@@ -20,25 +20,45 @@
 		plan = create_therapy_plan()
 		self.assertEquals(plan.status, 'Not Started')
 
-		session = make_therapy_session(plan.name, plan.patient, 'Basic Rehab')
+		session = make_therapy_session(plan.name, plan.patient, 'Basic Rehab', '_Test Company')
 		frappe.get_doc(session).submit()
 		self.assertEquals(frappe.db.get_value('Therapy Plan', plan.name, 'status'), 'In Progress')
 
-		session = make_therapy_session(plan.name, plan.patient, 'Basic Rehab')
+		session = make_therapy_session(plan.name, plan.patient, 'Basic Rehab', '_Test Company')
 		frappe.get_doc(session).submit()
 		self.assertEquals(frappe.db.get_value('Therapy Plan', plan.name, 'status'), 'Completed')
 
+	def test_therapy_plan_from_template(self):
+		patient = create_patient()
+		template = create_therapy_plan_template()
+		# check linked item
+		self.assertTrue(frappe.db.exists('Therapy Plan Template', {'linked_item': 'Complete Rehab'}))
 
-def create_therapy_plan():
+		plan = create_therapy_plan(template)
+		# invoice
+		si = make_sales_invoice(plan.name, patient, '_Test Company', template)
+		si.save()
+
+		therapy_plan_template_amt = frappe.db.get_value('Therapy Plan Template', template, 'total_amount')
+		self.assertEquals(si.items[0].amount, therapy_plan_template_amt)
+
+
+def create_therapy_plan(template=None):
 	patient = create_patient()
 	therapy_type = create_therapy_type()
 	plan = frappe.new_doc('Therapy Plan')
 	plan.patient = patient
 	plan.start_date = getdate()
-	plan.append('therapy_plan_details', {
-		'therapy_type': therapy_type.name,
-		'no_of_sessions': 2
-	})
+
+	if template:
+		plan.therapy_plan_template = template
+		plan = plan.set_therapy_details_from_template()
+	else:
+		plan.append('therapy_plan_details', {
+			'therapy_type': therapy_type.name,
+			'no_of_sessions': 2
+		})
+
 	plan.save()
 	return plan
 
@@ -55,3 +75,22 @@
 	encounter.save()
 	encounter.submit()
 	return encounter
+
+def create_therapy_plan_template():
+	template_name = frappe.db.exists('Therapy Plan Template', 'Complete Rehab')
+	if not template_name:
+		therapy_type = create_therapy_type()
+		template = frappe.new_doc('Therapy Plan Template')
+		template.plan_name = template.item_code = template.item_name = 'Complete Rehab'
+		template.item_group = 'Services'
+		rate = frappe.db.get_value('Therapy Type', therapy_type.name, 'rate')
+		template.append('therapy_types', {
+			'therapy_type': therapy_type.name,
+			'no_of_sessions': 2,
+			'rate': rate,
+			'amount': 2 * flt(rate)
+		})
+		template.save()
+		template_name = template.name
+
+	return template_name
diff --git a/erpnext/healthcare/doctype/therapy_plan/therapy_plan.js b/erpnext/healthcare/doctype/therapy_plan/therapy_plan.js
index dea0cfe..490d458 100644
--- a/erpnext/healthcare/doctype/therapy_plan/therapy_plan.js
+++ b/erpnext/healthcare/doctype/therapy_plan/therapy_plan.js
@@ -37,7 +37,8 @@
 						args: {
 							therapy_plan: frm.doc.name,
 							patient: frm.doc.patient,
-							therapy_type: data.therapy_type
+							therapy_type: data.therapy_type,
+							company: frm.doc.company
 						},
 						freeze: true,
 						callback: function(r) {
@@ -49,13 +50,53 @@
 					});
 				}, __('Select Therapy Type'), __('Create'));
 			}, __('Create'));
+
+			if (frm.doc.therapy_plan_template && !frm.doc.invoiced) {
+				frm.add_custom_button(__('Sales Invoice'), function() {
+					frm.trigger('make_sales_invoice');
+				}, __('Create'));
+			}
+		}
+
+		if (frm.doc.therapy_plan_template) {
+			frappe.meta.get_docfield('Therapy Plan Detail', 'therapy_type', frm.doc.name).read_only = 1;
+			frappe.meta.get_docfield('Therapy Plan Detail', 'no_of_sessions', frm.doc.name).read_only = 1;
+		}
+	},
+
+	make_sales_invoice: function(frm) {
+		frappe.call({
+			args: {
+				'reference_name': frm.doc.name,
+				'patient': frm.doc.patient,
+				'company': frm.doc.company,
+				'therapy_plan_template': frm.doc.therapy_plan_template
+			},
+			method: 'erpnext.healthcare.doctype.therapy_plan.therapy_plan.make_sales_invoice',
+			callback: function(r) {
+				var doclist = frappe.model.sync(r.message);
+				frappe.set_route('Form', doclist[0].doctype, doclist[0].name);
+			}
+		});
+	},
+
+	therapy_plan_template: function(frm) {
+		if (frm.doc.therapy_plan_template) {
+			frappe.call({
+				method: 'set_therapy_details_from_template',
+				doc: frm.doc,
+				freeze: true,
+				freeze_message: __('Fetching Template Details'),
+				callback: function() {
+					refresh_field('therapy_plan_details');
+				}
+			});
 		}
 	},
 
 	show_progress_for_therapies: function(frm) {
 		let bars = [];
 		let message = '';
-		let added_min = false;
 
 		// completed sessions
 		let title = __('{0} sessions completed', [frm.doc.total_sessions_completed]);
@@ -71,7 +112,6 @@
 		});
 		if (bars[0].width == '0%') {
 			bars[0].width = '0.5%';
-			added_min = 0.5;
 		}
 		message = title;
 		frm.dashboard.add_progress(__('Status'), bars, message);
diff --git a/erpnext/healthcare/doctype/therapy_plan/therapy_plan.json b/erpnext/healthcare/doctype/therapy_plan/therapy_plan.json
index 9edfeb2..ccb316e 100644
--- a/erpnext/healthcare/doctype/therapy_plan/therapy_plan.json
+++ b/erpnext/healthcare/doctype/therapy_plan/therapy_plan.json
@@ -9,11 +9,13 @@
   "naming_series",
   "patient",
   "patient_name",
+  "invoiced",
   "column_break_4",
   "company",
   "status",
   "start_date",
   "section_break_3",
+  "therapy_plan_template",
   "therapy_plan_details",
   "title",
   "section_break_9",
@@ -46,6 +48,7 @@
    "fieldtype": "Table",
    "label": "Therapy Plan Details",
    "options": "Therapy Plan Detail",
+   "read_only_depends_on": "therapy_plan_template",
    "reqd": 1
   },
   {
@@ -105,11 +108,27 @@
    "fieldtype": "Link",
    "in_standard_filter": 1,
    "label": "Company",
-   "options": "Company"
+   "options": "Company",
+   "reqd": 1
+  },
+  {
+   "fieldname": "therapy_plan_template",
+   "fieldtype": "Link",
+   "label": "Therapy Plan Template",
+   "options": "Therapy Plan Template"
+  },
+  {
+   "default": "0",
+   "fieldname": "invoiced",
+   "fieldtype": "Check",
+   "label": "Invoiced",
+   "no_copy": 1,
+   "print_hide": 1,
+   "read_only": 1
   }
  ],
  "links": [],
- "modified": "2020-05-25 14:38:53.649315",
+ "modified": "2020-10-23 01:27:42.128855",
  "modified_by": "Administrator",
  "module": "Healthcare",
  "name": "Therapy Plan",
diff --git a/erpnext/healthcare/doctype/therapy_plan/therapy_plan.py b/erpnext/healthcare/doctype/therapy_plan/therapy_plan.py
index e0f015f..bc0ff1a 100644
--- a/erpnext/healthcare/doctype/therapy_plan/therapy_plan.py
+++ b/erpnext/healthcare/doctype/therapy_plan/therapy_plan.py
@@ -5,7 +5,7 @@
 from __future__ import unicode_literals
 import frappe
 from frappe.model.document import Document
-from frappe.utils import today
+from frappe.utils import flt, today
 
 class TherapyPlan(Document):
 	def validate(self):
@@ -33,13 +33,26 @@
 		self.db_set('total_sessions', total_sessions)
 		self.db_set('total_sessions_completed', total_sessions_completed)
 
+	def set_therapy_details_from_template(self):
+		# Add therapy types in the child table
+		self.set('therapy_plan_details', [])
+		therapy_plan_template = frappe.get_doc('Therapy Plan Template', self.therapy_plan_template)
+
+		for data in therapy_plan_template.therapy_types:
+			self.append('therapy_plan_details', {
+				'therapy_type': data.therapy_type,
+				'no_of_sessions': data.no_of_sessions
+			})
+		return self
+
 
 @frappe.whitelist()
-def make_therapy_session(therapy_plan, patient, therapy_type):
+def make_therapy_session(therapy_plan, patient, therapy_type, company):
 	therapy_type = frappe.get_doc('Therapy Type', therapy_type)
 
 	therapy_session = frappe.new_doc('Therapy Session')
 	therapy_session.therapy_plan = therapy_plan
+	therapy_session.company = company
 	therapy_session.patient = patient
 	therapy_session.therapy_type = therapy_type.name
 	therapy_session.duration = therapy_type.default_duration
@@ -48,4 +61,39 @@
 
 	if frappe.flags.in_test:
 		therapy_session.start_date = today()
-	return therapy_session.as_dict()
\ No newline at end of file
+	return therapy_session.as_dict()
+
+
+@frappe.whitelist()
+def make_sales_invoice(reference_name, patient, company, therapy_plan_template):
+	from erpnext.stock.get_item_details import get_item_details
+	si = frappe.new_doc('Sales Invoice')
+	si.company = company
+	si.patient = patient
+	si.customer = frappe.db.get_value('Patient', patient, 'customer')
+
+	item = frappe.db.get_value('Therapy Plan Template', therapy_plan_template, 'linked_item')
+	price_list, price_list_currency = frappe.db.get_values('Price List', {'selling': 1}, ['name', 'currency'])[0]
+	args = {
+		'doctype': 'Sales Invoice',
+		'item_code': item,
+		'company': company,
+		'customer': si.customer,
+		'selling_price_list': price_list,
+		'price_list_currency': price_list_currency,
+		'plc_conversion_rate': 1.0,
+		'conversion_rate': 1.0
+	}
+
+	item_line = si.append('items', {})
+	item_details = get_item_details(args)
+	item_line.item_code = item
+	item_line.qty = 1
+	item_line.rate = item_details.price_list_rate
+	item_line.amount = flt(item_line.rate) * flt(item_line.qty)
+	item_line.reference_dt = 'Therapy Plan'
+	item_line.reference_dn = reference_name
+	item_line.description = item_details.description
+
+	si.set_missing_values(for_validate = True)
+	return si
diff --git a/erpnext/healthcare/doctype/therapy_plan/therapy_plan_dashboard.py b/erpnext/healthcare/doctype/therapy_plan/therapy_plan_dashboard.py
index df64782..6526acd 100644
--- a/erpnext/healthcare/doctype/therapy_plan/therapy_plan_dashboard.py
+++ b/erpnext/healthcare/doctype/therapy_plan/therapy_plan_dashboard.py
@@ -4,10 +4,18 @@
 def get_data():
 	return {
 		'fieldname': 'therapy_plan',
+		'non_standard_fieldnames': {
+			'Sales Invoice': 'reference_dn'
+		},
 		'transactions': [
 			{
 				'label': _('Therapy Sessions'),
 				'items': ['Therapy Session']
+			},
+			{
+				'label': _('Billing'),
+				'items': ['Sales Invoice']
 			}
-		]
+		],
+		'disable_create_buttons': ['Sales Invoice']
 	}
diff --git a/erpnext/healthcare/doctype/therapy_plan_detail/therapy_plan_detail.json b/erpnext/healthcare/doctype/therapy_plan_detail/therapy_plan_detail.json
index 9eb20e2..555587e 100644
--- a/erpnext/healthcare/doctype/therapy_plan_detail/therapy_plan_detail.json
+++ b/erpnext/healthcare/doctype/therapy_plan_detail/therapy_plan_detail.json
@@ -35,7 +35,7 @@
  ],
  "istable": 1,
  "links": [],
- "modified": "2020-03-30 22:02:01.740109",
+ "modified": "2020-10-08 01:17:34.778028",
  "modified_by": "Administrator",
  "module": "Healthcare",
  "name": "Therapy Plan Detail",
diff --git a/erpnext/healthcare/doctype/therapy_plan_template/__init__.py b/erpnext/healthcare/doctype/therapy_plan_template/__init__.py
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/erpnext/healthcare/doctype/therapy_plan_template/__init__.py
diff --git a/erpnext/healthcare/doctype/therapy_plan_template/test_therapy_plan_template.py b/erpnext/healthcare/doctype/therapy_plan_template/test_therapy_plan_template.py
new file mode 100644
index 0000000..33ee29d
--- /dev/null
+++ b/erpnext/healthcare/doctype/therapy_plan_template/test_therapy_plan_template.py
@@ -0,0 +1,10 @@
+# -*- coding: utf-8 -*-
+# Copyright (c) 2020, Frappe Technologies Pvt. Ltd. and Contributors
+# See license.txt
+from __future__ import unicode_literals
+
+# import frappe
+import unittest
+
+class TestTherapyPlanTemplate(unittest.TestCase):
+	pass
diff --git a/erpnext/healthcare/doctype/therapy_plan_template/therapy_plan_template.js b/erpnext/healthcare/doctype/therapy_plan_template/therapy_plan_template.js
new file mode 100644
index 0000000..86de192
--- /dev/null
+++ b/erpnext/healthcare/doctype/therapy_plan_template/therapy_plan_template.js
@@ -0,0 +1,57 @@
+// Copyright (c) 2020, Frappe Technologies Pvt. Ltd. and contributors
+// For license information, please see license.txt
+
+frappe.ui.form.on('Therapy Plan Template', {
+	refresh: function(frm) {
+		frm.set_query('therapy_type', 'therapy_types', () => {
+			return {
+				filters: {
+					'is_billable': 1
+				}
+			};
+		});
+	},
+
+	set_totals: function(frm) {
+		let total_sessions = 0;
+		let total_amount = 0.0;
+		frm.doc.therapy_types.forEach((d) => {
+			if (d.no_of_sessions) total_sessions += cint(d.no_of_sessions);
+			if (d.amount) total_amount += flt(d.amount);
+		});
+		frm.set_value('total_sessions', total_sessions);
+		frm.set_value('total_amount', total_amount);
+		frm.refresh_fields();
+	}
+});
+
+frappe.ui.form.on('Therapy Plan Template Detail', {
+	therapy_type: function(frm, cdt, cdn) {
+		let row = locals[cdt][cdn];
+		frappe.call('frappe.client.get', {
+			doctype: 'Therapy Type',
+			name: row.therapy_type
+		}).then((res) => {
+			row.rate = res.message.rate;
+			if (!row.no_of_sessions)
+				row.no_of_sessions = 1;
+			row.amount = flt(row.rate) * cint(row.no_of_sessions);
+			frm.refresh_field('therapy_types');
+			frm.trigger('set_totals');
+		});
+	},
+
+	no_of_sessions: function(frm, cdt, cdn) {
+		let row = locals[cdt][cdn];
+		row.amount = flt(row.rate) * cint(row.no_of_sessions);
+		frm.refresh_field('therapy_types');
+		frm.trigger('set_totals');
+	},
+
+	rate: function(frm, cdt, cdn) {
+		let row = locals[cdt][cdn];
+		row.amount = flt(row.rate) * cint(row.no_of_sessions);
+		frm.refresh_field('therapy_types');
+		frm.trigger('set_totals');
+	}
+});
diff --git a/erpnext/healthcare/doctype/therapy_plan_template/therapy_plan_template.json b/erpnext/healthcare/doctype/therapy_plan_template/therapy_plan_template.json
new file mode 100644
index 0000000..48fc896
--- /dev/null
+++ b/erpnext/healthcare/doctype/therapy_plan_template/therapy_plan_template.json
@@ -0,0 +1,132 @@
+{
+ "actions": [],
+ "autoname": "field:plan_name",
+ "creation": "2020-09-22 17:51:38.861055",
+ "doctype": "DocType",
+ "editable_grid": 1,
+ "engine": "InnoDB",
+ "field_order": [
+  "plan_name",
+  "linked_item_details_section",
+  "item_code",
+  "item_name",
+  "item_group",
+  "column_break_6",
+  "description",
+  "linked_item",
+  "therapy_types_section",
+  "therapy_types",
+  "section_break_11",
+  "total_sessions",
+  "column_break_13",
+  "total_amount"
+ ],
+ "fields": [
+  {
+   "fieldname": "plan_name",
+   "fieldtype": "Data",
+   "in_list_view": 1,
+   "label": "Plan Name",
+   "reqd": 1,
+   "unique": 1
+  },
+  {
+   "fieldname": "therapy_types_section",
+   "fieldtype": "Section Break",
+   "label": "Therapy Types"
+  },
+  {
+   "fieldname": "therapy_types",
+   "fieldtype": "Table",
+   "label": "Therapy Types",
+   "options": "Therapy Plan Template Detail",
+   "reqd": 1
+  },
+  {
+   "fieldname": "linked_item",
+   "fieldtype": "Link",
+   "label": "Linked Item",
+   "options": "Item",
+   "read_only": 1
+  },
+  {
+   "fieldname": "linked_item_details_section",
+   "fieldtype": "Section Break",
+   "label": "Linked Item Details"
+  },
+  {
+   "fieldname": "item_code",
+   "fieldtype": "Data",
+   "label": "Item Code",
+   "reqd": 1,
+   "set_only_once": 1
+  },
+  {
+   "fieldname": "item_name",
+   "fieldtype": "Data",
+   "label": "Item Name",
+   "reqd": 1
+  },
+  {
+   "fieldname": "item_group",
+   "fieldtype": "Link",
+   "label": "Item Group",
+   "options": "Item Group",
+   "reqd": 1
+  },
+  {
+   "fieldname": "column_break_6",
+   "fieldtype": "Column Break"
+  },
+  {
+   "fieldname": "description",
+   "fieldtype": "Small Text",
+   "label": "Item Description"
+  },
+  {
+   "fieldname": "total_amount",
+   "fieldtype": "Currency",
+   "label": "Total Amount",
+   "read_only": 1
+  },
+  {
+   "fieldname": "section_break_11",
+   "fieldtype": "Section Break"
+  },
+  {
+   "fieldname": "total_sessions",
+   "fieldtype": "Int",
+   "label": "Total Sessions",
+   "read_only": 1
+  },
+  {
+   "fieldname": "column_break_13",
+   "fieldtype": "Column Break"
+  }
+ ],
+ "index_web_pages_for_search": 1,
+ "links": [],
+ "modified": "2020-10-08 00:56:58.062105",
+ "modified_by": "Administrator",
+ "module": "Healthcare",
+ "name": "Therapy Plan Template",
+ "owner": "Administrator",
+ "permissions": [
+  {
+   "create": 1,
+   "delete": 1,
+   "email": 1,
+   "export": 1,
+   "print": 1,
+   "read": 1,
+   "report": 1,
+   "role": "System Manager",
+   "share": 1,
+   "write": 1
+  }
+ ],
+ "quick_entry": 1,
+ "sort_field": "modified",
+ "sort_order": "DESC",
+ "track_changes": 1
+}
\ No newline at end of file
diff --git a/erpnext/healthcare/doctype/therapy_plan_template/therapy_plan_template.py b/erpnext/healthcare/doctype/therapy_plan_template/therapy_plan_template.py
new file mode 100644
index 0000000..748c12c
--- /dev/null
+++ b/erpnext/healthcare/doctype/therapy_plan_template/therapy_plan_template.py
@@ -0,0 +1,73 @@
+# -*- coding: utf-8 -*-
+# Copyright (c) 2020, Frappe Technologies Pvt. Ltd. and contributors
+# For license information, please see license.txt
+
+from __future__ import unicode_literals
+import frappe
+from frappe.model.document import Document
+from frappe.utils import cint, flt
+from erpnext.healthcare.doctype.therapy_type.therapy_type import make_item_price
+
+class TherapyPlanTemplate(Document):
+	def after_insert(self):
+		self.create_item_from_template()
+
+	def validate(self):
+		self.set_totals()
+
+	def on_update(self):
+		doc_before_save = self.get_doc_before_save()
+		if not doc_before_save: return
+		if doc_before_save.item_name != self.item_name or doc_before_save.item_group != self.item_group \
+			or doc_before_save.description != self.description:
+			self.update_item()
+
+		if doc_before_save.therapy_types != self.therapy_types:
+			self.update_item_price()
+
+	def set_totals(self):
+		total_sessions = 0
+		total_amount = 0
+
+		for entry in self.therapy_types:
+			total_sessions += cint(entry.no_of_sessions)
+			total_amount += flt(entry.amount)
+
+		self.total_sessions = total_sessions
+		self.total_amount = total_amount
+
+	def create_item_from_template(self):
+		uom = frappe.db.exists('UOM', 'Nos') or frappe.db.get_single_value('Stock Settings', 'stock_uom')
+
+		item = frappe.get_doc({
+			'doctype': 'Item',
+			'item_code': self.item_code,
+			'item_name': self.item_name,
+			'item_group': self.item_group,
+			'description': self.description,
+			'is_sales_item': 1,
+			'is_service_item': 1,
+			'is_purchase_item': 0,
+			'is_stock_item': 0,
+			'show_in_website': 0,
+			'is_pro_applicable': 0,
+			'stock_uom': uom
+		}).insert(ignore_permissions=True, ignore_mandatory=True)
+
+		make_item_price(item.name, self.total_amount)
+		self.db_set('linked_item', item.name)
+
+	def update_item(self):
+		item_doc = frappe.get_doc('Item', {'item_code': self.linked_item})
+		item_doc.item_name = self.item_name
+		item_doc.item_group = self.item_group
+		item_doc.description = self.description
+		item_doc.ignore_mandatory = True
+		item_doc.save(ignore_permissions=True)
+
+	def update_item_price(self):
+		item_price = frappe.get_doc('Item Price', {'item_code': self.linked_item})
+		item_price.item_name = self.item_name
+		item_price.price_list_rate = self.total_amount
+		item_price.ignore_mandatory = True
+		item_price.save(ignore_permissions=True)
\ No newline at end of file
diff --git a/erpnext/healthcare/doctype/therapy_plan_template/therapy_plan_template_dashboard.py b/erpnext/healthcare/doctype/therapy_plan_template/therapy_plan_template_dashboard.py
new file mode 100644
index 0000000..c748fbf
--- /dev/null
+++ b/erpnext/healthcare/doctype/therapy_plan_template/therapy_plan_template_dashboard.py
@@ -0,0 +1,13 @@
+from __future__ import unicode_literals
+from frappe import _
+
+def get_data():
+	return {
+		'fieldname': 'therapy_plan_template',
+		'transactions': [
+			{
+				'label': _('Therapy Plans'),
+				'items': ['Therapy Plan']
+			}
+		]
+	}
diff --git a/erpnext/healthcare/doctype/therapy_plan_template_detail/__init__.py b/erpnext/healthcare/doctype/therapy_plan_template_detail/__init__.py
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/erpnext/healthcare/doctype/therapy_plan_template_detail/__init__.py
diff --git a/erpnext/healthcare/doctype/therapy_plan_template_detail/therapy_plan_template_detail.json b/erpnext/healthcare/doctype/therapy_plan_template_detail/therapy_plan_template_detail.json
new file mode 100644
index 0000000..5553a11
--- /dev/null
+++ b/erpnext/healthcare/doctype/therapy_plan_template_detail/therapy_plan_template_detail.json
@@ -0,0 +1,54 @@
+{
+ "actions": [],
+ "creation": "2020-10-07 23:04:44.373381",
+ "doctype": "DocType",
+ "editable_grid": 1,
+ "engine": "InnoDB",
+ "field_order": [
+  "therapy_type",
+  "no_of_sessions",
+  "rate",
+  "amount"
+ ],
+ "fields": [
+  {
+   "fieldname": "therapy_type",
+   "fieldtype": "Link",
+   "in_list_view": 1,
+   "label": "Therapy Type",
+   "options": "Therapy Type",
+   "reqd": 1
+  },
+  {
+   "fieldname": "no_of_sessions",
+   "fieldtype": "Int",
+   "in_list_view": 1,
+   "label": "No of Sessions"
+  },
+  {
+   "fieldname": "rate",
+   "fieldtype": "Currency",
+   "in_list_view": 1,
+   "label": "Rate"
+  },
+  {
+   "fieldname": "amount",
+   "fieldtype": "Currency",
+   "in_list_view": 1,
+   "label": "Amount",
+   "read_only": 1
+  }
+ ],
+ "istable": 1,
+ "links": [],
+ "modified": "2020-10-07 23:46:54.296322",
+ "modified_by": "Administrator",
+ "module": "Healthcare",
+ "name": "Therapy Plan Template Detail",
+ "owner": "Administrator",
+ "permissions": [],
+ "quick_entry": 1,
+ "sort_field": "modified",
+ "sort_order": "DESC",
+ "track_changes": 1
+}
\ No newline at end of file
diff --git a/erpnext/healthcare/doctype/therapy_plan_template_detail/therapy_plan_template_detail.py b/erpnext/healthcare/doctype/therapy_plan_template_detail/therapy_plan_template_detail.py
new file mode 100644
index 0000000..7b979fe
--- /dev/null
+++ b/erpnext/healthcare/doctype/therapy_plan_template_detail/therapy_plan_template_detail.py
@@ -0,0 +1,10 @@
+# -*- coding: utf-8 -*-
+# Copyright (c) 2020, Frappe Technologies Pvt. Ltd. and contributors
+# For license information, please see license.txt
+
+from __future__ import unicode_literals
+# import frappe
+from frappe.model.document import Document
+
+class TherapyPlanTemplateDetail(Document):
+	pass
diff --git a/erpnext/healthcare/doctype/therapy_session/therapy_session.js b/erpnext/healthcare/doctype/therapy_session/therapy_session.js
index e66e667..65d4cc4 100644
--- a/erpnext/healthcare/doctype/therapy_session/therapy_session.js
+++ b/erpnext/healthcare/doctype/therapy_session/therapy_session.js
@@ -92,7 +92,8 @@
 						'start_date': data.message.appointment_date,
 						'start_time': data.message.appointment_time,
 						'service_unit': data.message.service_unit,
-						'company': data.message.company
+						'company': data.message.company,
+						'duration': data.message.duration
 					};
 					frm.set_value(values);
 				}
@@ -107,6 +108,7 @@
 				'start_date': '',
 				'start_time': '',
 				'service_unit': '',
+				'duration': ''
 			};
 			frm.set_value(values);
 		}
diff --git a/erpnext/healthcare/doctype/therapy_session/therapy_session.json b/erpnext/healthcare/doctype/therapy_session/therapy_session.json
index dc0cafc..1f877cc 100644
--- a/erpnext/healthcare/doctype/therapy_session/therapy_session.json
+++ b/erpnext/healthcare/doctype/therapy_session/therapy_session.json
@@ -47,7 +47,8 @@
    "fieldname": "appointment",
    "fieldtype": "Link",
    "label": "Appointment",
-   "options": "Patient Appointment"
+   "options": "Patient Appointment",
+   "set_only_once": 1
   },
   {
    "fieldname": "patient",
@@ -90,7 +91,8 @@
    "fetch_from": "therapy_template.default_duration",
    "fieldname": "duration",
    "fieldtype": "Int",
-   "label": "Duration"
+   "label": "Duration",
+   "reqd": 1
   },
   {
    "fieldname": "location",
@@ -220,7 +222,7 @@
  ],
  "is_submittable": 1,
  "links": [],
- "modified": "2020-06-30 10:56:10.354268",
+ "modified": "2020-10-22 23:10:21.178644",
  "modified_by": "Administrator",
  "module": "Healthcare",
  "name": "Therapy Session",
diff --git a/erpnext/healthcare/doctype/therapy_session/therapy_session.py b/erpnext/healthcare/doctype/therapy_session/therapy_session.py
index 9650183..85d0970 100644
--- a/erpnext/healthcare/doctype/therapy_session/therapy_session.py
+++ b/erpnext/healthcare/doctype/therapy_session/therapy_session.py
@@ -4,16 +4,41 @@
 
 from __future__ import unicode_literals
 import frappe
+import datetime
 from frappe.model.document import Document
+from frappe.utils import get_time, flt
 from frappe.model.mapper import get_mapped_doc
 from frappe import _
-from frappe.utils import cstr, getdate
+from frappe.utils import cstr, getdate, get_link_to_form
 from erpnext.healthcare.doctype.healthcare_settings.healthcare_settings import get_receivable_account, get_income_account
 
 class TherapySession(Document):
 	def validate(self):
+		self.validate_duplicate()
 		self.set_total_counts()
 
+	def validate_duplicate(self):
+		end_time = datetime.datetime.combine(getdate(self.start_date), get_time(self.start_time)) \
+			 + datetime.timedelta(minutes=flt(self.duration))
+
+		overlaps = frappe.db.sql("""
+		select
+			name
+		from
+			`tabTherapy Session`
+		where
+			start_date=%s and name!=%s and docstatus!=2
+			and (practitioner=%s or patient=%s) and
+			((start_time<%s and start_time + INTERVAL duration MINUTE>%s) or
+			(start_time>%s and start_time<%s) or
+			(start_time=%s))
+		""", (self.start_date, self.name, self.practitioner, self.patient,
+		self.start_time, end_time.time(), self.start_time, end_time.time(), self.start_time))
+
+		if overlaps:
+			overlapping_details = _('Therapy Session overlaps with {0}').format(get_link_to_form('Therapy Session', overlaps[0][0]))
+			frappe.throw(overlapping_details, title=_('Therapy Sessions Overlapping'))
+
 	def on_submit(self):
 		self.update_sessions_count_in_therapy_plan()
 		insert_session_medical_record(self)
diff --git a/erpnext/healthcare/doctype/therapy_type/therapy_type.py b/erpnext/healthcare/doctype/therapy_type/therapy_type.py
index ea3d84e..6c825b8 100644
--- a/erpnext/healthcare/doctype/therapy_type/therapy_type.py
+++ b/erpnext/healthcare/doctype/therapy_type/therapy_type.py
@@ -41,7 +41,7 @@
 			if self.rate:
 				item_price = frappe.get_doc('Item Price', {'item_code': self.item})
 				item_price.item_name = self.item_name
-				item_price.price_list_name = self.rate
+				item_price.price_list_rate = self.rate
 				item_price.ignore_mandatory = True
 				item_price.save()
 
diff --git a/erpnext/healthcare/utils.py b/erpnext/healthcare/utils.py
index dbd3b83..96282f5 100644
--- a/erpnext/healthcare/utils.py
+++ b/erpnext/healthcare/utils.py
@@ -23,9 +23,9 @@
 		items_to_invoice += get_lab_tests_to_invoice(patient, company)
 		items_to_invoice += get_clinical_procedures_to_invoice(patient, company)
 		items_to_invoice += get_inpatient_services_to_invoice(patient, company)
+		items_to_invoice += get_therapy_plans_to_invoice(patient, company)
 		items_to_invoice += get_therapy_sessions_to_invoice(patient, company)
 
-
 		return items_to_invoice
 
 
@@ -35,6 +35,7 @@
 		msg +=  " <b><a href='#Form/Patient/{0}'>{0}</a></b>".format(patient.name)
 		frappe.throw(msg, title=_('Customer Not Found'))
 
+
 def get_appointments_to_invoice(patient, company):
 	appointments_to_invoice = []
 	patient_appointments = frappe.get_list(
@@ -246,12 +247,44 @@
 	return services_to_invoice
 
 
+def get_therapy_plans_to_invoice(patient, company):
+	therapy_plans_to_invoice = []
+	therapy_plans = frappe.get_list(
+		'Therapy Plan',
+		fields=['therapy_plan_template', 'name'],
+		filters={
+			'patient': patient.name,
+			'invoiced': 0,
+			'company': company,
+			'therapy_plan_template': ('!=', '')
+		}
+	)
+	for plan in therapy_plans:
+		therapy_plans_to_invoice.append({
+			'reference_type': 'Therapy Plan',
+			'reference_name': plan.name,
+			'service': frappe.db.get_value('Therapy Plan Template', plan.therapy_plan_template, 'linked_item')
+		})
+
+	return therapy_plans_to_invoice
+
+
 def get_therapy_sessions_to_invoice(patient, company):
 	therapy_sessions_to_invoice = []
+	therapy_plans = frappe.db.get_all('Therapy Plan', {'therapy_plan_template': ('!=', '')})
+	therapy_plans_created_from_template = []
+	for entry in therapy_plans:
+		therapy_plans_created_from_template.append(entry.name)
+
 	therapy_sessions = frappe.get_list(
 		'Therapy Session',
 		fields='*',
-		filters={'patient': patient.name, 'invoiced': 0, 'company': company}
+		filters={
+			'patient': patient.name,
+			'invoiced': 0,
+			'company': company,
+			'therapy_plan': ('not in', therapy_plans_created_from_template)
+		}
 	)
 	for therapy in therapy_sessions:
 		if not therapy.appointment:
@@ -368,8 +401,8 @@
 	else:
 		is_invoiced = frappe.db.get_value(item.reference_dt, item.reference_dn, 'invoiced')
 	if is_invoiced:
-		frappe.throw(_('The item referenced by {0} - {1} is already invoiced'\
-		).format(item.reference_dt, item.reference_dn))
+		frappe.throw(_('The item referenced by {0} - {1} is already invoiced').format(
+			item.reference_dt, item.reference_dn))
 
 
 def manage_prescriptions(invoiced, ref_dt, ref_dn, dt, created_check_field):
diff --git a/erpnext/hooks.py b/erpnext/hooks.py
index cf1d69f..dbb6c0d 100644
--- a/erpnext/hooks.py
+++ b/erpnext/hooks.py
@@ -21,11 +21,16 @@
 web_include_css = "assets/css/erpnext-web.css"
 
 doctype_js = {
+	"Address": "public/js/address.js",
 	"Communication": "public/js/communication.js",
 	"Event": "public/js/event.js",
 	"Newsletter": "public/js/newsletter.js"
 }
 
+override_doctype_class = {
+	'Address': 'erpnext.accounts.custom.address.ERPNextAddress'
+}
+
 welcome_email = "erpnext.setup.utils.welcome_email"
 
 # setup wizard
@@ -277,7 +282,8 @@
 # to maintain data integrity we exempted payment entry. it will un-link when sales invoice get cancelled.
 # if payment entry not in auto cancel exempted doctypes it will cancel payment entry.
 auto_cancel_exempted_doctypes= [
-	"Payment Entry"
+	"Payment Entry",
+	"Inpatient Medication Entry"
 ]
 
 scheduler_events = {
@@ -561,4 +567,4 @@
 		{'doctype': 'Hotel Room Package', 'index': 3},
 		{'doctype': 'Hotel Room Type', 'index': 4}
 	]
-}
\ No newline at end of file
+}
diff --git a/erpnext/hr/doctype/employee/employee.py b/erpnext/hr/doctype/employee/employee.py
index 85eaa5e..dfc600c 100755
--- a/erpnext/hr/doctype/employee/employee.py
+++ b/erpnext/hr/doctype/employee/employee.py
@@ -56,7 +56,7 @@
 			if existing_user_id:
 				remove_user_permission(
 					"Employee", self.name, existing_user_id)
-	
+
 	def after_rename(self, old, new, merge):
 		self.db_set("employee", new)
 
@@ -181,8 +181,11 @@
 			)
 			if reports_to:
 				link_to_employees = [frappe.utils.get_link_to_form('Employee', employee.name, label=employee.employee_name) for employee in reports_to]
-				throw(_("Employee status cannot be set to 'Left' as following employees are currently reporting to this employee:&nbsp;")
-					+ ', '.join(link_to_employees), EmployeeLeftValidationError)
+				message = _("The following employees are currently still reporting to {0}:").format(frappe.bold(self.employee_name))
+				message += "<br><br><ul><li>" + "</li><li>".join(link_to_employees)
+				message += "</li></ul><br>"
+				message += _("Please make sure the employees above report to another Active employee.")
+				throw(message, EmployeeLeftValidationError, _("Cannot Relieve Employee"))
 			if not self.relieving_date:
 				throw(_("Please enter relieving date."))
 
@@ -215,7 +218,7 @@
 
 	def validate_preferred_email(self):
 		if self.prefered_contact_email and not self.get(scrub(self.prefered_contact_email)):
-			frappe.msgprint(_("Please enter " + self.prefered_contact_email))
+			frappe.msgprint(_("Please enter {0}").format(self.prefered_contact_email))
 
 	def validate_onboarding_process(self):
 		employee_onboarding = frappe.get_all("Employee Onboarding",
@@ -417,9 +420,9 @@
 @frappe.whitelist()
 def get_children(doctype, parent=None, company=None, is_root=False, is_tree=False):
 
-	filters = []
+	filters = [['status', '!=', 'Left']]
 	if company and company != 'All Companies':
-		filters = [['company', '=', company]]
+		filters.append(['company', '=', company])
 
 	fields = ['name as value', 'employee_name as title']
 
diff --git a/erpnext/hr/doctype/hr_settings/hr_settings.json b/erpnext/hr/doctype/hr_settings/hr_settings.json
index c42e1d7..4374d29 100644
--- a/erpnext/hr/doctype/hr_settings/hr_settings.json
+++ b/erpnext/hr/doctype/hr_settings/hr_settings.json
@@ -28,144 +28,110 @@
   {
    "fieldname": "employee_settings",
    "fieldtype": "Section Break",
-   "label": "Employee Settings",
-   "show_days": 1,
-   "show_seconds": 1
+   "label": "Employee Settings"
   },
   {
    "description": "Enter retirement age in years",
    "fieldname": "retirement_age",
    "fieldtype": "Data",
-   "label": "Retirement Age",
-   "show_days": 1,
-   "show_seconds": 1
+   "label": "Retirement Age"
   },
   {
    "default": "Naming Series",
-   "description": "Employee record is created using selected field. ",
+   "description": "Employee records are created using the selected field",
    "fieldname": "emp_created_by",
    "fieldtype": "Select",
-   "label": "Employee Records to be created by",
-   "options": "Naming Series\nEmployee Number\nFull Name",
-   "show_days": 1,
-   "show_seconds": 1
+   "label": "Employee Records to Be Created By",
+   "options": "Naming Series\nEmployee Number\nFull Name"
   },
   {
    "fieldname": "column_break_4",
-   "fieldtype": "Column Break",
-   "show_days": 1,
-   "show_seconds": 1
+   "fieldtype": "Column Break"
   },
   {
    "default": "0",
-   "description": "Don't send Employee Birthday Reminders",
+   "description": "Don't send employee birthday reminders",
    "fieldname": "stop_birthday_reminders",
    "fieldtype": "Check",
-   "label": "Stop Birthday Reminders",
-   "show_days": 1,
-   "show_seconds": 1
+   "label": "Stop Birthday Reminders"
   },
   {
    "default": "1",
    "fieldname": "expense_approver_mandatory_in_expense_claim",
    "fieldtype": "Check",
-   "label": "Expense Approver Mandatory In Expense Claim",
-   "show_days": 1,
-   "show_seconds": 1
+   "label": "Expense Approver Mandatory In Expense Claim"
   },
   {
    "collapsible": 1,
    "fieldname": "leave_settings",
    "fieldtype": "Section Break",
-   "label": "Leave Settings",
-   "show_days": 1,
-   "show_seconds": 1
+   "label": "Leave Settings"
   },
   {
    "fieldname": "leave_approval_notification_template",
    "fieldtype": "Link",
    "label": "Leave Approval Notification Template",
-   "options": "Email Template",
-   "show_days": 1,
-   "show_seconds": 1
+   "options": "Email Template"
   },
   {
    "fieldname": "leave_status_notification_template",
    "fieldtype": "Link",
    "label": "Leave Status Notification Template",
-   "options": "Email Template",
-   "show_days": 1,
-   "show_seconds": 1
+   "options": "Email Template"
   },
   {
    "fieldname": "column_break_18",
-   "fieldtype": "Column Break",
-   "show_days": 1,
-   "show_seconds": 1
+   "fieldtype": "Column Break"
   },
   {
    "default": "1",
    "fieldname": "leave_approver_mandatory_in_leave_application",
    "fieldtype": "Check",
-   "label": "Leave Approver Mandatory In Leave Application",
-   "show_days": 1,
-   "show_seconds": 1
+   "label": "Leave Approver Mandatory In Leave Application"
   },
   {
    "default": "0",
    "fieldname": "show_leaves_of_all_department_members_in_calendar",
    "fieldtype": "Check",
-   "label": "Show Leaves Of All Department Members In Calendar",
-   "show_days": 1,
-   "show_seconds": 1
+   "label": "Show Leaves Of All Department Members In Calendar"
   },
   {
    "collapsible": 1,
    "fieldname": "hiring_settings",
    "fieldtype": "Section Break",
-   "label": "Hiring Settings",
-   "show_days": 1,
-   "show_seconds": 1
+   "label": "Hiring Settings"
   },
   {
    "default": "0",
    "fieldname": "check_vacancies",
    "fieldtype": "Check",
-   "label": "Check Vacancies On Job Offer Creation",
-   "show_days": 1,
-   "show_seconds": 1
+   "label": "Check Vacancies On Job Offer Creation"
   },
   {
    "default": "0",
    "fieldname": "auto_leave_encashment",
    "fieldtype": "Check",
-   "label": "Auto Leave Encashment",
-   "show_days": 1,
-   "show_seconds": 1
+   "label": "Auto Leave Encashment"
   },
   {
    "default": "0",
    "fieldname": "restrict_backdated_leave_application",
    "fieldtype": "Check",
-   "label": "Restrict Backdated Leave Application",
-   "show_days": 1,
-   "show_seconds": 1
+   "label": "Restrict Backdated Leave Applications"
   },
   {
    "depends_on": "eval:doc.restrict_backdated_leave_application == 1",
    "fieldname": "role_allowed_to_create_backdated_leave_application",
    "fieldtype": "Link",
    "label": "Role Allowed to Create Backdated Leave Application",
-   "options": "Role",
-   "show_days": 1,
-   "show_seconds": 1
+   "options": "Role"
   }
  ],
  "icon": "fa fa-cog",
  "idx": 1,
  "issingle": 1,
  "links": [],
- "modified": "2020-06-04 15:15:09.865476",
+ "modified": "2020-10-13 11:49:46.168027",
  "modified_by": "Administrator",
  "module": "HR",
  "name": "HR Settings",
@@ -183,4 +149,4 @@
  ],
  "sort_field": "modified",
  "sort_order": "ASC"
-}
\ No newline at end of file
+}
diff --git a/erpnext/hr/doctype/vehicle_log/test_vehicle_log.py b/erpnext/hr/doctype/vehicle_log/test_vehicle_log.py
index e9dc776..cf0048c 100644
--- a/erpnext/hr/doctype/vehicle_log/test_vehicle_log.py
+++ b/erpnext/hr/doctype/vehicle_log/test_vehicle_log.py
@@ -6,18 +6,28 @@
 import frappe
 import unittest
 from frappe.utils import nowdate,flt, cstr,random_string
+from erpnext.hr.doctype.employee.test_employee import make_employee
+from erpnext.hr.doctype.vehicle_log.vehicle_log import make_expense_claim
 
 class TestVehicleLog(unittest.TestCase):
+	def setUp(self):
+		employee_id = frappe.db.sql("""select name from `tabEmployee` where name='testdriver@example.com'""")
+		self.employee_id = employee_id[0][0] if employee_id else None
+
+		if not self.employee_id:
+			self.employee_id = make_employee("testdriver@example.com", company="_Test Company")
+
+		self.license_plate = get_vehicle(self.employee_id)
+	
+	def tearDown(self):
+		frappe.delete_doc("Vehicle", self.license_plate, force=1)
+		frappe.delete_doc("Employee", self.employee_id, force=1)
+
 	def test_make_vehicle_log_and_syncing_of_odometer_value(self):
-		employee_id = frappe.db.sql("""select name from `tabEmployee` where status='Active' order by modified desc limit 1""")
-		employee_id = employee_id[0][0] if employee_id else None
-
-		license_plate = get_vehicle(employee_id)
-
 		vehicle_log = frappe.get_doc({
 			"doctype": "Vehicle Log",
-			"license_plate": cstr(license_plate),
-			"employee":employee_id,
+			"license_plate": cstr(self.license_plate),
+			"employee": self.employee_id,
 			"date":frappe.utils.nowdate(),
 			"odometer":5010,
 			"fuel_qty":frappe.utils.flt(50),
@@ -27,7 +37,7 @@
 		vehicle_log.submit()
 
 		#checking value of vehicle odometer value on submit.
-		vehicle = frappe.get_doc("Vehicle", license_plate)
+		vehicle = frappe.get_doc("Vehicle", self.license_plate)
 		self.assertEqual(vehicle.last_odometer, vehicle_log.odometer)
 
 		#checking value vehicle odometer on vehicle log cancellation.
@@ -40,6 +50,28 @@
 
 		self.assertEqual(vehicle.last_odometer, current_odometer - distance_travelled)
 
+		vehicle_log.delete()
+	
+	def test_vehicle_log_fuel_expense(self):
+		vehicle_log = frappe.get_doc({
+			"doctype": "Vehicle Log",
+			"license_plate": cstr(self.license_plate),
+			"employee": self.employee_id,
+			"date": frappe.utils.nowdate(),
+			"odometer":5010,
+			"fuel_qty":frappe.utils.flt(50),
+			"price": frappe.utils.flt(500)
+		})
+		vehicle_log.save()
+		vehicle_log.submit()
+
+		expense_claim = make_expense_claim(vehicle_log.name)
+		fuel_expense = expense_claim.expenses[0].amount
+		self.assertEqual(fuel_expense, 50*500)
+
+		vehicle_log.cancel()
+		frappe.delete_doc("Expense Claim", expense_claim.name)
+		frappe.delete_doc("Vehicle Log", vehicle_log.name)
 
 def get_vehicle(employee_id):
 	license_plate=random_string(10).upper()
diff --git a/erpnext/hr/doctype/vehicle_log/vehicle_log.py b/erpnext/hr/doctype/vehicle_log/vehicle_log.py
index 8affab2..04c94e3 100644
--- a/erpnext/hr/doctype/vehicle_log/vehicle_log.py
+++ b/erpnext/hr/doctype/vehicle_log/vehicle_log.py
@@ -32,7 +32,7 @@
 	vehicle_log = frappe.get_doc("Vehicle Log", docname)
 	service_expense = sum([flt(d.expense_amount) for d in vehicle_log.service_detail])
 
-	claim_amount = service_expense + flt(vehicle_log.price)
+	claim_amount = service_expense + (flt(vehicle_log.price) * flt(vehicle_log.fuel_qty) or 1)
 	if not claim_amount:
 		frappe.throw(_("No additional expenses has been added"))
 
diff --git a/erpnext/manufacturing/doctype/bom/bom.py b/erpnext/manufacturing/doctype/bom/bom.py
index 71d49a9..2ab1b98 100644
--- a/erpnext/manufacturing/doctype/bom/bom.py
+++ b/erpnext/manufacturing/doctype/bom/bom.py
@@ -55,10 +55,11 @@
 			conflicting_bom = frappe.get_doc("BOM", name)
 
 			if conflicting_bom.item != self.item:
+				msg = (_("A BOM with name {0} already exists for item {1}.")
+					.format(frappe.bold(name), frappe.bold(conflicting_bom.item)))
 
-				frappe.throw(_("""A BOM with name {0} already exists for item {1}.
-					<br> Did you rename the item? Please contact Administrator / Tech support
-				""").format(frappe.bold(name), frappe.bold(conflicting_bom.item)))
+				frappe.throw(_("{0}{1} Did you rename the item? Please contact Administrator / Tech support")
+					.format(msg, "<br>"))
 
 		self.name = name
 
@@ -72,6 +73,7 @@
 		self.validate_uom_is_interger()
 		self.set_bom_material_details()
 		self.validate_materials()
+		self.set_routing_operations()
 		self.validate_operations()
 		self.calculate_cost()
 		self.update_cost(update_parent=False, from_child_bom=True, save=False)
@@ -111,18 +113,13 @@
 	def get_routing(self):
 		if self.routing:
 			self.set("operations", [])
-			for d in frappe.get_all("BOM Operation", fields = ["*"],
-				filters = {'parenttype': 'Routing', 'parent': self.routing}, order_by="idx"):
-				child = self.append('operations', {
-					"operation": d.operation,
-					"workstation": d.workstation,
-					"description": d.description,
-					"time_in_mins": d.time_in_mins,
-					"batch_size": d.batch_size,
-					"operating_cost": d.operating_cost,
-					"idx": d.idx
-				})
-				child.hour_rate = flt(d.hour_rate / self.conversion_rate, 2)
+			fields = ["sequence_id", "operation", "workstation", "description",
+				"time_in_mins", "batch_size", "operating_cost", "idx", "hour_rate"]
+
+			for row in frappe.get_all("BOM Operation", fields = fields,
+				filters = {'parenttype': 'Routing', 'parent': self.routing}, order_by="sequence_id, idx"):
+				child = self.append('operations', row)
+				child.hour_rate = flt(row.hour_rate / self.conversion_rate, 2)
 
 	def set_bom_material_details(self):
 		for item in self.get("items"):
@@ -571,6 +568,10 @@
 			if act_pbom and act_pbom[0][0]:
 				frappe.throw(_("Cannot deactivate or cancel BOM as it is linked with other BOMs"))
 
+	def set_routing_operations(self):
+		if self.routing and self.with_operations and not self.operations:
+			self.get_routing()
+
 	def validate_operations(self):
 		if self.with_operations and not self.get('operations'):
 			frappe.throw(_("Operations cannot be left blank"))
diff --git a/erpnext/manufacturing/doctype/bom_operation/bom_operation.json b/erpnext/manufacturing/doctype/bom_operation/bom_operation.json
index 0350e2c..07464e3 100644
--- a/erpnext/manufacturing/doctype/bom_operation/bom_operation.json
+++ b/erpnext/manufacturing/doctype/bom_operation/bom_operation.json
@@ -1,10 +1,12 @@
 {
+ "actions": [],
  "creation": "2013-02-22 01:27:49",
  "doctype": "DocType",
  "document_type": "Setup",
  "editable_grid": 1,
  "engine": "InnoDB",
  "field_order": [
+  "sequence_id",
   "operation",
   "workstation",
   "description",
@@ -106,11 +108,19 @@
    "fieldname": "batch_size",
    "fieldtype": "Int",
    "label": "Batch Size"
+  },
+  {
+   "depends_on": "eval:doc.parenttype == \"Routing\"",
+   "fieldname": "sequence_id",
+   "fieldtype": "Int",
+   "label": "Sequence ID"
   }
  ],
  "idx": 1,
+ "index_web_pages_for_search": 1,
  "istable": 1,
- "modified": "2020-06-16 17:01:11.128420",
+ "links": [],
+ "modified": "2020-10-13 18:14:10.018774",
  "modified_by": "Administrator",
  "module": "Manufacturing",
  "name": "BOM Operation",
diff --git a/erpnext/manufacturing/doctype/job_card/job_card.json b/erpnext/manufacturing/doctype/job_card/job_card.json
index 087ab6b..575e719 100644
--- a/erpnext/manufacturing/doctype/job_card/job_card.json
+++ b/erpnext/manufacturing/doctype/job_card/job_card.json
@@ -36,6 +36,7 @@
   "items",
   "more_information",
   "operation_id",
+  "sequence_id",
   "transferred_qty",
   "requested_qty",
   "column_break_20",
@@ -297,10 +298,18 @@
    "fieldname": "operation_row_number",
    "fieldtype": "Select",
    "label": "Operation Row Number"
+  },
+  {
+   "fieldname": "sequence_id",
+   "fieldtype": "Int",
+   "label": "Sequence Id",
+   "print_hide": 1,
+   "read_only": 1
   }
  ],
  "is_submittable": 1,
- "modified": "2020-08-24 15:21:21.398267",
+ "links": [],
+ "modified": "2020-10-14 12:58:25.327897",
  "modified_by": "Administrator",
  "module": "Manufacturing",
  "name": "Job Card",
diff --git a/erpnext/manufacturing/doctype/job_card/job_card.py b/erpnext/manufacturing/doctype/job_card/job_card.py
index 8855e0a..4dfa78b 100644
--- a/erpnext/manufacturing/doctype/job_card/job_card.py
+++ b/erpnext/manufacturing/doctype/job_card/job_card.py
@@ -5,7 +5,7 @@
 from __future__ import unicode_literals
 import frappe
 import datetime
-from frappe import _
+from frappe import _, bold
 from frappe.model.mapper import get_mapped_doc
 from frappe.model.document import Document
 from frappe.utils import (flt, cint, time_diff_in_hours, get_datetime, getdate,
@@ -16,12 +16,14 @@
 class OverlapError(frappe.ValidationError): pass
 
 class OperationMismatchError(frappe.ValidationError): pass
+class OperationSequenceError(frappe.ValidationError): pass
 
 class JobCard(Document):
 	def validate(self):
 		self.validate_time_logs()
 		self.set_status()
 		self.validate_operation_id()
+		self.validate_sequence_id()
 
 	def validate_time_logs(self):
 		self.total_completed_qty = 0.0
@@ -196,14 +198,14 @@
 	def validate_job_card(self):
 		if not self.time_logs:
 			frappe.throw(_("Time logs are required for {0} {1}")
-				.format(frappe.bold("Job Card"), get_link_to_form("Job Card", self.name)))
+				.format(bold("Job Card"), get_link_to_form("Job Card", self.name)))
 
 		if self.for_quantity and self.total_completed_qty != self.for_quantity:
-			total_completed_qty = frappe.bold(_("Total Completed Qty"))
-			qty_to_manufacture = frappe.bold(_("Qty to Manufacture"))
+			total_completed_qty = bold(_("Total Completed Qty"))
+			qty_to_manufacture = bold(_("Qty to Manufacture"))
 
-			frappe.throw(_("The {0} ({1}) must be equal to {2} ({3})"
-				.format(total_completed_qty, frappe.bold(self.total_completed_qty), qty_to_manufacture,frappe.bold(self.for_quantity))))
+			frappe.throw(_("The {0} ({1}) must be equal to {2} ({3})")
+				.format(total_completed_qty, bold(self.total_completed_qty), qty_to_manufacture,bold(self.for_quantity)))
 
 	def update_work_order(self):
 		if not self.work_order:
@@ -213,10 +215,7 @@
 		from_time_list, to_time_list = [], []
 
 		field = "operation_id"
-		data = frappe.get_all('Job Card',
-			fields = ["sum(total_time_in_mins) as time_in_mins", "sum(total_completed_qty) as completed_qty"],
-			filters = {"docstatus": 1, "work_order": self.work_order, field: self.get(field)})
-
+		data = self.get_current_operation_data()
 		if data and len(data) > 0:
 			for_quantity = data[0].completed_qty
 			time_in_mins = data[0].time_in_mins
@@ -246,6 +245,11 @@
 			wo.set_actual_dates()
 			wo.save()
 
+	def get_current_operation_data(self):
+		return frappe.get_all('Job Card',
+			fields = ["sum(total_time_in_mins) as time_in_mins", "sum(total_completed_qty) as completed_qty"],
+			filters = {"docstatus": 1, "work_order": self.work_order, "operation_id": self.operation_id})
+
 	def set_transferred_qty(self, update_status=False):
 		if not self.items:
 			self.transferred_qty = self.for_quantity if self.docstatus == 1 else 0
@@ -310,9 +314,32 @@
 	def validate_operation_id(self):
 		if (self.get("operation_id") and self.get("operation_row_number") and self.operation and self.work_order and
 			frappe.get_cached_value("Work Order Operation", self.operation_row_number, "name") != self.operation_id):
-			work_order = frappe.bold(get_link_to_form("Work Order", self.work_order))
+			work_order = bold(get_link_to_form("Work Order", self.work_order))
 			frappe.throw(_("Operation {0} does not belong to the work order {1}")
-				.format(frappe.bold(self.operation), work_order), OperationMismatchError)
+				.format(bold(self.operation), work_order), OperationMismatchError)
+
+	def validate_sequence_id(self):
+		if not (self.work_order and self.sequence_id): return
+
+		current_operation_qty = 0.0
+		data = self.get_current_operation_data()
+		if data and len(data) > 0:
+			current_operation_qty = flt(data[0].completed_qty)
+
+		current_operation_qty += flt(self.total_completed_qty)
+
+		data = frappe.get_all("Work Order Operation",
+			fields = ["operation", "status", "completed_qty"],
+			filters={"docstatus": 1, "parent": self.work_order, "sequence_id": ('<', self.sequence_id)},
+			order_by = "sequence_id, idx")
+
+		message = "Job Card {0}: As per the sequence of the operations in the work order {1}".format(bold(self.name),
+			bold(get_link_to_form("Work Order", self.work_order)))
+
+		for row in data:
+			if row.status != "Completed" and row.completed_qty < current_operation_qty:
+				frappe.throw(_("{0}, complete the operation {1} before the operation {2}.")
+					.format(message, bold(row.operation), bold(self.operation)), OperationSequenceError)
 
 @frappe.whitelist()
 def get_operation_details(work_order, operation):
diff --git a/erpnext/manufacturing/doctype/manufacturing_settings/manufacturing_settings.json b/erpnext/manufacturing/doctype/manufacturing_settings/manufacturing_settings.json
index 86fa7a8..b7634da 100644
--- a/erpnext/manufacturing/doctype/manufacturing_settings/manufacturing_settings.json
+++ b/erpnext/manufacturing/doctype/manufacturing_settings/manufacturing_settings.json
@@ -1,4 +1,5 @@
 {
+ "actions": [],
  "creation": "2014-11-27 14:12:07.542534",
  "doctype": "DocType",
  "document_type": "Document",
@@ -36,7 +37,7 @@
   {
    "default": "0",
    "depends_on": "eval:!doc.disable_capacity_planning",
-   "description": "Plan time logs outside Workstation Working Hours.",
+   "description": "Plan time logs outside Workstation working hours",
    "fieldname": "allow_overtime",
    "fieldtype": "Check",
    "label": "Allow Overtime"
@@ -56,17 +57,17 @@
   {
    "default": "30",
    "depends_on": "eval:!doc.disable_capacity_planning",
-   "description": "Try planning operations for X days in advance.",
+   "description": "Plan operations X days in advance",
    "fieldname": "capacity_planning_for_days",
    "fieldtype": "Int",
    "label": "Capacity Planning For (Days)"
   },
   {
    "depends_on": "eval:!doc.disable_capacity_planning",
-   "description": "Default 10 mins",
+   "description": "Default: 10 mins",
    "fieldname": "mins_between_operations",
    "fieldtype": "Int",
-   "label": "Time Between Operations (in mins)"
+   "label": "Time Between Operations (Mins)"
   },
   {
    "fieldname": "section_break_6",
@@ -92,14 +93,14 @@
   },
   {
    "default": "0",
-   "description": "Allow multiple Material Consumption against a Work Order",
+   "description": "Allow multiple material consumptions against a Work Order",
    "fieldname": "material_consumption",
    "fieldtype": "Check",
    "label": "Allow Multiple Material Consumption"
   },
   {
    "default": "0",
-   "description": "Update BOM cost automatically via Scheduler, based on latest valuation rate / price list rate / last purchase rate of raw materials.",
+   "description": "Update BOM cost automatically via scheduler, based on the latest Valuation Rate/Price List Rate/Last Purchase Rate of raw materials",
    "fieldname": "update_bom_costs_automatically",
    "fieldtype": "Check",
    "label": "Update BOM Cost Automatically"
@@ -135,7 +136,7 @@
   {
    "fieldname": "over_production_for_sales_and_work_order_section",
    "fieldtype": "Section Break",
-   "label": "Over Production for Sales and Work Order"
+   "label": "Overproduction for Sales and Work Order"
   },
   {
    "fieldname": "raw_materials_consumption_section",
@@ -157,8 +158,10 @@
   }
  ],
  "icon": "icon-wrench",
+ "index_web_pages_for_search": 1,
  "issingle": 1,
- "modified": "2019-11-26 13:10:45.569341",
+ "links": [],
+ "modified": "2020-10-13 10:55:43.996581",
  "modified_by": "Administrator",
  "module": "Manufacturing",
  "name": "Manufacturing Settings",
@@ -175,4 +178,4 @@
  "sort_field": "modified",
  "sort_order": "DESC",
  "track_changes": 1
-}
\ No newline at end of file
+}
diff --git a/erpnext/manufacturing/doctype/operation/test_operation.py b/erpnext/manufacturing/doctype/operation/test_operation.py
index 17d206a..0067231 100644
--- a/erpnext/manufacturing/doctype/operation/test_operation.py
+++ b/erpnext/manufacturing/doctype/operation/test_operation.py
@@ -9,3 +9,23 @@
 
 class TestOperation(unittest.TestCase):
 	pass
+
+def make_operation(*args, **kwargs):
+	args = args if args else kwargs
+	if isinstance(args, tuple):
+		args = args[0]
+
+	args = frappe._dict(args)
+
+	try:
+		doc = frappe.get_doc({
+			"doctype": "Operation",
+			"name": args.operation,
+			"workstation": args.workstation
+		})
+
+		doc.insert()
+
+		return doc
+	except frappe.DuplicateEntryError:
+		return frappe.get_doc("Operation", args.operation)
\ 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 5b14d05..b6552d5 100644
--- a/erpnext/manufacturing/doctype/production_plan/production_plan.py
+++ b/erpnext/manufacturing/doctype/production_plan/production_plan.py
@@ -322,12 +322,13 @@
 		work_orders = []
 		bom_data = {}
 
-		get_sub_assembly_items(item.get("bom_no"), bom_data)
+		get_sub_assembly_items(item.get("bom_no"), bom_data, item.get("qty"))
 
 		for key, data in bom_data.items():
 			data.update({
-				'qty': data.get("stock_qty") * item.get("qty"),
+				'qty': data.get("stock_qty"),
 				'production_plan': self.name,
+				'use_multi_level_bom': item.get("use_multi_level_bom"),
 				'company': self.company,
 				'fg_warehouse': item.get("fg_warehouse"),
 				'update_consumed_material_cost_in_project': 0
@@ -781,7 +782,7 @@
 #		"description": item_details.get("description")
 	}
 
-def get_sub_assembly_items(bom_no, bom_data):
+def get_sub_assembly_items(bom_no, bom_data, to_produce_qty):
 	data = get_children('BOM', parent = bom_no)
 	for d in data:
 		if d.expandable:
@@ -798,6 +799,6 @@
 				})
 
 			bom_item = bom_data.get(key)
-			bom_item["stock_qty"] += d.stock_qty / d.parent_bom_qty
+			bom_item["stock_qty"] += (d.stock_qty / d.parent_bom_qty) * flt(to_produce_qty)
 
-			get_sub_assembly_items(bom_item.get("bom_no"), bom_data)
+			get_sub_assembly_items(bom_item.get("bom_no"), bom_data, bom_item["stock_qty"])
diff --git a/erpnext/manufacturing/doctype/production_plan/test_production_plan.py b/erpnext/manufacturing/doctype/production_plan/test_production_plan.py
index ca67d71..fa9d080 100644
--- a/erpnext/manufacturing/doctype/production_plan/test_production_plan.py
+++ b/erpnext/manufacturing/doctype/production_plan/test_production_plan.py
@@ -158,6 +158,46 @@
 		self.assertTrue(mr.material_request_type, 'Customer Provided')
 		self.assertTrue(mr.customer, '_Test Customer')
 
+	def test_production_plan_with_multi_level_bom(self):
+		#|Item Code			|	Qty	|
+		#|Test BOM 1	 		|	1	|
+		#|	Test BOM 2		|	2	|
+		#|		Test BOM 3	|	3	|
+
+		for item_code in ["Test BOM 1", "Test BOM 2", "Test BOM 3", "Test RM BOM 1"]:
+			create_item(item_code, is_stock_item=1)
+
+		# created bom upto 3 level
+		if not frappe.db.get_value('BOM', {'item': "Test BOM 3"}):
+			make_bom(item = "Test BOM 3", raw_materials = ["Test RM BOM 1"], rm_qty=3)
+
+		if not frappe.db.get_value('BOM', {'item': "Test BOM 2"}):
+			make_bom(item = "Test BOM 2", raw_materials = ["Test BOM 3"], rm_qty=3)
+
+		if not frappe.db.get_value('BOM', {'item': "Test BOM 1"}):
+			make_bom(item = "Test BOM 1", raw_materials = ["Test BOM 2"], rm_qty=2)
+
+		item_code = "Test BOM 1"
+		pln = frappe.new_doc('Production Plan')
+		pln.company = "_Test Company"
+		pln.append("po_items", {
+			"item_code": item_code,
+			"bom_no": frappe.db.get_value('BOM', {'item': "Test BOM 1"}),
+			"planned_qty": 3,
+			"make_work_order_for_sub_assembly_items": 1
+		})
+
+		pln.submit()
+		pln.make_work_order()
+
+		#last level sub-assembly work order produce qty
+		to_produce_qty = frappe.db.get_value("Work Order",
+			{"production_plan": pln.name, "production_item": "Test BOM 3"}, "qty")
+
+		self.assertEqual(to_produce_qty, 18.0)
+		pln.cancel()
+		frappe.delete_doc("Production Plan", pln.name)
+
 def create_production_plan(**args):
 	args = frappe._dict(args)
 
@@ -197,7 +237,9 @@
 		'item': args.item,
 		'currency': args.currency or 'USD',
 		'quantity': args.quantity or 1,
-		'company': args.company or '_Test Company'
+		'company': args.company or '_Test Company',
+		'routing': args.routing,
+		'with_operations': args.with_operations or 0
 	})
 
 	for item in args.raw_materials:
@@ -205,12 +247,16 @@
 
 		bom.append('items', {
 			'item_code': item,
-			'qty': 1,
+			'qty': args.rm_qty or 1.0,
 			'uom': item_doc.stock_uom,
 			'stock_uom': item_doc.stock_uom,
 			'rate': item_doc.valuation_rate or args.rate,
 		})
 
-	bom.insert(ignore_permissions=True)
-	bom.submit()
-	return bom
\ No newline at end of file
+	if not args.do_not_save:
+		bom.insert(ignore_permissions=True)
+
+		if not args.do_not_submit:
+			bom.submit()
+
+	return bom
diff --git a/erpnext/manufacturing/doctype/routing/routing.js b/erpnext/manufacturing/doctype/routing/routing.js
index d7589fa..741a3f0 100644
--- a/erpnext/manufacturing/doctype/routing/routing.js
+++ b/erpnext/manufacturing/doctype/routing/routing.js
@@ -2,6 +2,13 @@
 // For license information, please see license.txt
 
 frappe.ui.form.on('Routing', {
+	setup: function(frm) {
+		frappe.meta.get_docfield("BOM Operation", "sequence_id",
+			frm.doc.name).in_list_view = true;
+
+		frm.fields_dict.operations.grid.refresh();
+	},
+
 	calculate_operating_cost: function(frm, child) {
 		const operating_cost = flt(flt(child.hour_rate) * flt(child.time_in_mins) / 60, 2);
 		frappe.model.set_value(child.doctype, child.name, "operating_cost", operating_cost);
diff --git a/erpnext/manufacturing/doctype/routing/routing.py b/erpnext/manufacturing/doctype/routing/routing.py
index ecd0ba8..8312d74 100644
--- a/erpnext/manufacturing/doctype/routing/routing.py
+++ b/erpnext/manufacturing/doctype/routing/routing.py
@@ -3,7 +3,22 @@
 # For license information, please see license.txt
 
 from __future__ import unicode_literals
+import frappe
+from frappe.utils import cint
+from frappe import _
 from frappe.model.document import Document
 
 class Routing(Document):
-	pass
+	def validate(self):
+		self.set_routing_id()
+
+	def set_routing_id(self):
+		sequence_id = 0
+		for row in self.operations:
+			if not row.sequence_id:
+				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))
+
+			sequence_id = row.sequence_id
\ No newline at end of file
diff --git a/erpnext/manufacturing/doctype/routing/test_routing.py b/erpnext/manufacturing/doctype/routing/test_routing.py
index 53ad152..73d05a6 100644
--- a/erpnext/manufacturing/doctype/routing/test_routing.py
+++ b/erpnext/manufacturing/doctype/routing/test_routing.py
@@ -4,6 +4,88 @@
 from __future__ import unicode_literals
 
 import unittest
+import frappe
+from frappe.test_runner import make_test_records
+from erpnext.stock.doctype.item.test_item import make_item
+from erpnext.manufacturing.doctype.operation.test_operation import make_operation
+from erpnext.manufacturing.doctype.job_card.job_card import OperationSequenceError
+from erpnext.manufacturing.doctype.workstation.test_workstation import make_workstation
+from erpnext.manufacturing.doctype.work_order.test_work_order import make_wo_order_test_record
 
 class TestRouting(unittest.TestCase):
-	pass
+	def test_sequence_id(self):
+		item_code = "Test Routing Item - A"
+		operations = [{"operation": "Test Operation A", "workstation": "Test Workstation A", "time_in_mins": 30},
+			{"operation": "Test Operation B", "workstation": "Test Workstation A", "time_in_mins": 20}]
+
+		make_test_records("UOM")
+
+		setup_operations(operations)
+		routing_doc = create_routing(routing_name="Testing Route", operations=operations)
+		bom_doc = setup_bom(item_code=item_code, routing=routing_doc.name)
+		wo_doc = make_wo_order_test_record(production_item = item_code, bom_no=bom_doc.name)
+
+		for row in routing_doc.operations:
+			self.assertEqual(row.sequence_id, row.idx)
+
+		for data in frappe.get_all("Job Card",
+			filters={"work_order": wo_doc.name}, order_by="sequence_id desc"):
+			job_card_doc = frappe.get_doc("Job Card", data.name)
+			job_card_doc.time_logs[0].completed_qty = 10
+			if job_card_doc.sequence_id != 1:
+				self.assertRaises(OperationSequenceError, job_card_doc.save)
+			else:
+				job_card_doc.save()
+				self.assertEqual(job_card_doc.total_completed_qty, 10)
+
+		wo_doc.cancel()
+		wo_doc.delete()
+
+def setup_operations(rows):
+	for row in rows:
+		make_workstation(row)
+		make_operation(row)
+
+def create_routing(**args):
+	args = frappe._dict(args)
+
+	doc = frappe.new_doc("Routing")
+	doc.update(args)
+
+	if not args.do_not_save:
+		try:
+			for operation in args.operations:
+				doc.append("operations", operation)
+
+			doc.insert()
+		except frappe.DuplicateEntryError:
+			doc = frappe.get_doc("Routing", args.routing_name)
+
+	return doc
+
+def setup_bom(**args):
+	from erpnext.manufacturing.doctype.production_plan.test_production_plan import make_bom
+
+	args = frappe._dict(args)
+
+	if not frappe.db.exists('Item', args.item_code):
+		make_item(args.item_code, {
+			'is_stock_item': 1
+		})
+
+	if not args.raw_materials:
+		if not frappe.db.exists('Item', "Test Extra Item 1"):
+			make_item("Test Extra Item N-1", {
+				'is_stock_item': 1,
+			})
+
+		args.raw_materials = ['Test Extra Item N-1']
+
+	name = frappe.db.get_value('BOM', {'item': args.item_code}, 'name')
+	if not name:
+		bom_doc = make_bom(item = args.item_code, raw_materials = args.get("raw_materials"),
+			routing = args.routing, with_operations=1)
+	else:
+		bom_doc = frappe.get_doc("BOM", name)
+
+	return bom_doc
\ 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 b7c7c32..5f8a134 100644
--- a/erpnext/manufacturing/doctype/work_order/test_work_order.py
+++ b/erpnext/manufacturing/doctype/work_order/test_work_order.py
@@ -193,6 +193,42 @@
 		self.assertEqual(cint(bin1_on_end_production.projected_qty),
 			cint(bin1_on_end_production.projected_qty))
 
+	def test_backflush_qty_for_overpduction_manufacture(self):
+		cancel_stock_entry = []
+		allow_overproduction("overproduction_percentage_for_work_order", 30)
+		wo_order = make_wo_order_test_record(planned_start_date=now(), qty=100)
+		ste1 = test_stock_entry.make_stock_entry(item_code="_Test Item",
+			target="_Test Warehouse - _TC", qty=120, basic_rate=5000.0)
+		ste2 = test_stock_entry.make_stock_entry(item_code="_Test Item Home Desktop 100",
+			target="_Test Warehouse - _TC", qty=240, basic_rate=1000.0)
+
+		cancel_stock_entry.extend([ste1.name, ste2.name])
+
+		s = frappe.get_doc(make_stock_entry(wo_order.name, "Material Transfer for Manufacture", 60))
+		s.submit()
+		cancel_stock_entry.append(s.name)
+
+		s = frappe.get_doc(make_stock_entry(wo_order.name, "Manufacture", 60))
+		s.submit()
+		cancel_stock_entry.append(s.name)
+
+		s = frappe.get_doc(make_stock_entry(wo_order.name, "Material Transfer for Manufacture", 60))
+		s.submit()
+		cancel_stock_entry.append(s.name)
+
+		s1 = frappe.get_doc(make_stock_entry(wo_order.name, "Manufacture", 50))
+		s1.submit()
+		cancel_stock_entry.append(s1.name)
+
+		self.assertEqual(s1.items[0].qty, 50)
+		self.assertEqual(s1.items[1].qty, 100)
+		cancel_stock_entry.reverse()
+		for ste in cancel_stock_entry:
+			doc = frappe.get_doc("Stock Entry", ste)
+			doc.cancel()
+
+		allow_overproduction("overproduction_percentage_for_work_order", 0)
+
 	def test_reserved_qty_for_stopped_production(self):
 		test_stock_entry.make_stock_entry(item_code="_Test Item",
 			target= self.warehouse, qty=100, basic_rate=100)
@@ -407,6 +443,49 @@
 		ste1 = frappe.get_doc(make_stock_entry(wo.name, "Manufacture", 1))
 		self.assertEqual(len(ste1.items), 3)
 
+	def test_operation_time_with_batch_size(self):
+		fg_item = "Test Batch Size Item For BOM"
+		rm1 = "Test Batch Size Item RM 1 For BOM"
+
+		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")
+
+		if not bom_name:
+			bom = make_bom(item=fg_item, rate=1000, raw_materials = [rm1], do_not_save=True)
+			bom.with_operations = 1
+			bom.append("operations", {
+				"operation": "_Test Operation 1",
+				"workstation": "_Test Workstation 1",
+				"description": "Test Data",
+				"operating_cost": 100,
+				"time_in_mins": 40,
+				"batch_size": 5
+			})
+
+			bom.save()
+			bom.submit()
+			bom_name = bom.name
+
+		work_order = make_wo_order_test_record(item=fg_item,
+			planned_start_date=now(), qty=1, do_not_save=True)
+
+		work_order.set_work_order_operations()
+		work_order.save()
+		self.assertEqual(work_order.operations[0].time_in_mins, 8.0)
+
+		work_order1 = make_wo_order_test_record(item=fg_item,
+			planned_start_date=now(), qty=5, do_not_save=True)
+
+		work_order1.set_work_order_operations()
+		work_order1.save()
+		self.assertEqual(work_order1.operations[0].time_in_mins, 40.0)
+
 def get_scrap_item_details(bom_no):
 	scrap_items = {}
 	for item in frappe.db.sql("""select item_code, stock_qty from `tabBOM Scrap Item`
diff --git a/erpnext/manufacturing/doctype/work_order/work_order.js b/erpnext/manufacturing/doctype/work_order/work_order.js
index a244f58..9ce465c 100644
--- a/erpnext/manufacturing/doctype/work_order/work_order.js
+++ b/erpnext/manufacturing/doctype/work_order/work_order.js
@@ -636,7 +636,7 @@
 				description: __('Max: {0}', [max]),
 				default: max
 			}, data => {
-				max += (max * (frm.doc.__onload.overproduction_percentage || 0.0)) / 100;
+				max += (frm.doc.qty * (frm.doc.__onload.overproduction_percentage || 0.0)) / 100;
 
 				if (data.qty > max) {
 					frappe.msgprint(__('Quantity must not be more than {0}', [max]));
diff --git a/erpnext/manufacturing/doctype/work_order/work_order.py b/erpnext/manufacturing/doctype/work_order/work_order.py
index 3173b6c..cc93bf9 100644
--- a/erpnext/manufacturing/doctype/work_order/work_order.py
+++ b/erpnext/manufacturing/doctype/work_order/work_order.py
@@ -378,7 +378,7 @@
 			select
 				operation, description, workstation, idx,
 				base_hour_rate as hour_rate, time_in_mins,
-				"Pending" as status, parent as bom, batch_size
+				"Pending" as status, parent as bom, batch_size, sequence_id
 			from
 				`tabBOM Operation`
 			where
@@ -403,7 +403,7 @@
 		bom_qty = frappe.db.get_value("BOM", self.bom_no, "quantity")
 
 		for d in self.get("operations"):
-			d.time_in_mins = flt(d.time_in_mins) / flt(bom_qty) * math.ceil(flt(self.qty) / flt(d.batch_size))
+			d.time_in_mins = flt(d.time_in_mins) / flt(bom_qty) * (flt(self.qty) / flt(d.batch_size))
 
 		self.calculate_operating_cost()
 
@@ -865,6 +865,7 @@
 		'bom_no': work_order.bom_no,
 		'project': work_order.project,
 		'company': work_order.company,
+		'sequence_id': row.get("sequence_id"),
 		'wip_warehouse': work_order.wip_warehouse
 	})
 
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 3f5e18e..8c5cde9 100644
--- a/erpnext/manufacturing/doctype/work_order_operation/work_order_operation.json
+++ b/erpnext/manufacturing/doctype/work_order_operation/work_order_operation.json
@@ -8,6 +8,7 @@
   "details",
   "operation",
   "bom",
+  "sequence_id",
   "description",
   "col_break1",
   "completed_qty",
@@ -187,11 +188,19 @@
    "fieldtype": "Int",
    "label": "Batch Size",
    "read_only": 1
+  },
+  {
+   "fieldname": "sequence_id",
+   "fieldtype": "Int",
+   "label": "Sequence ID",
+   "print_hide": 1,
+   "read_only": 1
   }
  ],
+ "index_web_pages_for_search": 1,
  "istable": 1,
  "links": [],
- "modified": "2019-12-03 19:24:29.594189",
+ "modified": "2020-10-14 12:58:49.241252",
  "modified_by": "Administrator",
  "module": "Manufacturing",
  "name": "Work Order Operation",
diff --git a/erpnext/manufacturing/doctype/workstation/test_workstation.py b/erpnext/manufacturing/doctype/workstation/test_workstation.py
index 8266cf7..c6699be 100644
--- a/erpnext/manufacturing/doctype/workstation/test_workstation.py
+++ b/erpnext/manufacturing/doctype/workstation/test_workstation.py
@@ -21,17 +21,22 @@
 		self.assertRaises(WorkstationHolidayError, check_if_within_operating_hours,
 			"_Test Workstation 1", "Operation 1", "2013-02-01 10:00:00", "2013-02-02 20:00:00")
 
-def make_workstation(**args):
+def make_workstation(*args, **kwargs):
+	args = args if args else kwargs
+	if isinstance(args, tuple):
+		args = args[0]
+
 	args = frappe._dict(args)
 
+	workstation_name = args.workstation_name or args.workstation
 	try:
 		doc = frappe.get_doc({
 			"doctype": "Workstation",
-			"workstation_name": args.workstation_name
+			"workstation_name": workstation_name
 		})
 
 		doc.insert()
 
 		return doc
 	except frappe.DuplicateEntryError:
-		return frappe.get_doc("Workstation", args.workstation_name)
\ No newline at end of file
+		return frappe.get_doc("Workstation", workstation_name)
\ No newline at end of file
diff --git a/erpnext/patches.txt b/erpnext/patches.txt
index 77310cd..8b34eaa 100644
--- a/erpnext/patches.txt
+++ b/erpnext/patches.txt
@@ -729,4 +729,6 @@
 erpnext.patches.v13_0.rename_issue_doctype_fields
 erpnext.patches.v13_0.change_default_pos_print_format
 erpnext.patches.v13_0.set_youtube_video_id
-erpnext.patches.v13_0.print_uom_after_quantity_patch
\ No newline at end of file
+erpnext.patches.v13_0.print_uom_after_quantity_patch
+erpnext.patches.v13_0.set_payment_channel_in_payment_gateway_account
+erpnext.patches.v13_0.create_healthcare_custom_fields_in_stock_entry_detail
diff --git a/erpnext/patches/v13_0/create_healthcare_custom_fields_in_stock_entry_detail.py b/erpnext/patches/v13_0/create_healthcare_custom_fields_in_stock_entry_detail.py
new file mode 100644
index 0000000..585e540
--- /dev/null
+++ b/erpnext/patches/v13_0/create_healthcare_custom_fields_in_stock_entry_detail.py
@@ -0,0 +1,10 @@
+import frappe
+from frappe.custom.doctype.custom_field.custom_field import create_custom_fields
+from erpnext.domains.healthcare import data
+
+def execute():
+	if 'Healthcare' not in frappe.get_active_domains():
+		return
+
+	if data['custom_fields']:
+		create_custom_fields(data['custom_fields'])
\ No newline at end of file
diff --git a/erpnext/patches/v13_0/set_payment_channel_in_payment_gateway_account.py b/erpnext/patches/v13_0/set_payment_channel_in_payment_gateway_account.py
new file mode 100644
index 0000000..edca238
--- /dev/null
+++ b/erpnext/patches/v13_0/set_payment_channel_in_payment_gateway_account.py
@@ -0,0 +1,17 @@
+from __future__ import unicode_literals
+import frappe
+
+def execute():
+	"""Set the payment gateway account as Email for all the existing payment channel."""
+	doc_meta = frappe.get_meta("Payment Gateway Account")
+	if doc_meta.get_field("payment_channel"):
+		return
+
+	frappe.reload_doc("Accounts", "doctype", "Payment Gateway Account")
+	set_payment_channel_as_email()
+
+def set_payment_channel_as_email():
+	frappe.db.sql("""
+		UPDATE `tabPayment Gateway Account`
+		SET `payment_channel` = "Email"
+	""")
\ No newline at end of file
diff --git a/erpnext/projects/report/billing_summary.py b/erpnext/projects/report/billing_summary.py
index b808268..6c3c05f 100644
--- a/erpnext/projects/report/billing_summary.py
+++ b/erpnext/projects/report/billing_summary.py
@@ -136,6 +136,7 @@
 	return timesheet_details_map
 
 def get_billable_and_total_duration(activity, start_time, end_time):
+	precision = frappe.get_precision("Timesheet Detail", "hours")
 	activity_duration = time_diff_in_hours(end_time, start_time)
 	billing_duration = 0.0
 	if activity.billable:
@@ -143,4 +144,4 @@
 		if activity_duration != activity.billing_hours:
 			billing_duration = activity_duration * activity.billing_hours / activity.hours
 
-	return flt(activity_duration, 2), flt(billing_duration, 2)
\ No newline at end of file
+	return flt(activity_duration, precision), flt(billing_duration, precision)
\ No newline at end of file
diff --git a/erpnext/public/js/address.js b/erpnext/public/js/address.js
new file mode 100644
index 0000000..57f7163
--- /dev/null
+++ b/erpnext/public/js/address.js
@@ -0,0 +1,25 @@
+// Copyright (c) 2016, Frappe Technologies and contributors
+// For license information, please see license.txt
+
+frappe.ui.form.on("Address", {
+	is_your_company_address: function(frm) {
+		frm.clear_table('links');
+		if(frm.doc.is_your_company_address) {
+			frm.add_child('links', {
+				link_doctype: 'Company',
+				link_name: frappe.defaults.get_user_default('Company')
+			});
+			frm.set_query('link_doctype', 'links', () => {
+				return {
+					filters: {
+						name: 'Company'
+					}
+				};
+			});
+			frm.refresh_field('links');
+		}
+		else {
+			frm.trigger('refresh');
+		}
+	}
+});
diff --git a/erpnext/public/js/setup_wizard.js b/erpnext/public/js/setup_wizard.js
index 9beba6a..5d21190 100644
--- a/erpnext/public/js/setup_wizard.js
+++ b/erpnext/public/js/setup_wizard.js
@@ -309,7 +309,6 @@
 	"Hong Kong": ["04-01", "03-31"],
 	"India": ["04-01", "03-31"],
 	"Iran": ["06-23", "06-22"],
-	"Italy": ["07-01", "06-30"],
 	"Myanmar": ["04-01", "03-31"],
 	"New Zealand": ["04-01", "03-31"],
 	"Pakistan": ["07-01", "06-30"],
diff --git a/erpnext/public/js/utils.js b/erpnext/public/js/utils.js
index 6d73418..ea2093e 100755
--- a/erpnext/public/js/utils.js
+++ b/erpnext/public/js/utils.js
@@ -703,9 +703,13 @@
 }
 
 frappe.form.link_formatters['Item'] = function(value, doc) {
-	if(doc && doc.item_name && doc.item_name !== value) {
-		return value? value + ': ' + doc.item_name: doc.item_name;
+	if (doc && value && doc.item_name && doc.item_name !== value) {
+		return value + ': ' + doc.item_name;
+	} else if (!value && doc.doctype && doc.item_name) {
+		// format blank value in child table
+		return doc.item_name;
 	} else {
+		// if value is blank in report view or item code and name are the same, return as is
 		return value;
 	}
 }
diff --git a/erpnext/public/js/utils/party.js b/erpnext/public/js/utils/party.js
index 44e75ae..770704e 100644
--- a/erpnext/public/js/utils/party.js
+++ b/erpnext/public/js/utils/party.js
@@ -277,7 +277,7 @@
 erpnext.utils.get_shipping_address = function(frm, callback){
 	if (frm.doc.company) {
 		frappe.call({
-			method: "frappe.contacts.doctype.address.address.get_shipping_address",
+			method: "erpnext.accounts.custom.address.get_shipping_address",
 			args: {
 				company: frm.doc.company,
 				address: frm.doc.shipping_address
diff --git a/erpnext/quality_management/doctype/quality_procedure/quality_procedure.js b/erpnext/quality_management/doctype/quality_procedure/quality_procedure.js
index cf2644e..ac87622 100644
--- a/erpnext/quality_management/doctype/quality_procedure/quality_procedure.js
+++ b/erpnext/quality_management/doctype/quality_procedure/quality_procedure.js
@@ -10,5 +10,13 @@
 				}
 			};
 		});
+
+		frm.set_query('parent_quality_procedure', function(){
+			return {
+				filters: {
+					is_group: 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 b3c0d94..1ed921c 100644
--- a/erpnext/quality_management/doctype/quality_procedure/quality_procedure.json
+++ b/erpnext/quality_management/doctype/quality_procedure/quality_procedure.json
@@ -21,8 +21,7 @@
    "fieldname": "parent_quality_procedure",
    "fieldtype": "Link",
    "label": "Parent Procedure",
-   "options": "Quality Procedure",
-   "read_only": 1
+   "options": "Quality Procedure"
   },
   {
    "default": "0",
@@ -73,7 +72,7 @@
  ],
  "is_tree": 1,
  "links": [],
- "modified": "2020-06-17 17:25:03.434953",
+ "modified": "2020-10-13 11:46:07.744194",
  "modified_by": "Administrator",
  "module": "Quality Management",
  "name": "Quality Procedure",
diff --git a/erpnext/quality_management/doctype/quality_procedure/quality_procedure.py b/erpnext/quality_management/doctype/quality_procedure/quality_procedure.py
index 1952e57..797c26b 100644
--- a/erpnext/quality_management/doctype/quality_procedure/quality_procedure.py
+++ b/erpnext/quality_management/doctype/quality_procedure/quality_procedure.py
@@ -4,7 +4,7 @@
 
 from __future__ import unicode_literals
 import frappe
-from frappe.utils.nestedset import NestedSet
+from frappe.utils.nestedset import NestedSet, rebuild_tree
 from frappe import _
 
 class QualityProcedure(NestedSet):
@@ -42,6 +42,8 @@
 			doc.save(ignore_permissions=True)
 
 	def set_parent(self):
+		rebuild_tree('Quality Procedure', 'parent_quality_procedure')
+
 		for process in self.processes:
 			# Set parent for only those children who don't have a parent
 			parent_quality_procedure = frappe.db.get_value("Quality Procedure", process.procedure, "parent_quality_procedure")
diff --git a/erpnext/regional/address_template/templates/luxembourg.html b/erpnext/regional/address_template/templates/luxembourg.html
new file mode 100644
index 0000000..75075e7
--- /dev/null
+++ b/erpnext/regional/address_template/templates/luxembourg.html
@@ -0,0 +1,4 @@
+{% if address_line1 %}{{ address_line1 }}<br>{% endif -%}
+{% if address_line2 %}{{ address_line2 }}<br>{% endif -%}
+{% if pincode %}L-{{ pincode }}{% endif -%}{% if city %} {{ city }}{% endif %}<br>
+{% if country %}{{ country | upper }}{% endif %}
diff --git a/erpnext/selling/doctype/sales_order/sales_order.js b/erpnext/selling/doctype/sales_order/sales_order.js
index 7b46fb6..989bd33 100644
--- a/erpnext/selling/doctype/sales_order/sales_order.js
+++ b/erpnext/selling/doctype/sales_order/sales_order.js
@@ -162,7 +162,7 @@
 
 					// sales invoice
 					if(flt(doc.per_billed, 6) < 100) {
-						this.frm.add_custom_button(__('Invoice'), () => me.make_sales_invoice(), __('Create'));
+						this.frm.add_custom_button(__('Sales Invoice'), () => me.make_sales_invoice(), __('Create'));
 					}
 
 					// material request
@@ -554,19 +554,32 @@
 	},
 
 	make_purchase_order: function(){
+		let pending_items = this.frm.doc.items.some((item) =>{
+			let pending_qty = flt(item.stock_qty) - flt(item.ordered_qty);
+			return pending_qty > 0;
+		})
+		if(!pending_items){
+			frappe.throw({message: __("Purchase Order already created for all Sales Order items"), title: __("Note")});
+		}
+
 		var me = this;
 		var dialog = new frappe.ui.Dialog({
-			title: __("For Supplier"),
+			title: __("Select Items"),
 			fields: [
-				{"fieldtype": "Link", "label": __("Supplier"), "fieldname": "supplier", "options":"Supplier",
-				 "description": __("Leave the field empty to make purchase orders for all suppliers"),
-					"get_query": function () {
-						return {
-							query:"erpnext.selling.doctype.sales_order.sales_order.get_supplier",
-							filters: {'parent': me.frm.doc.name}
-						}
-					}},
-					{fieldname: 'items_for_po', fieldtype: 'Table', label: 'Select Items',
+				{
+					"fieldtype": "Check",
+					"label": __("Against Default Supplier"),
+					"fieldname": "against_default_supplier",
+					"default": 0
+				},
+				{
+					"fieldtype": "Section Break",
+					"label": "",
+					"fieldname": "sec_break_dialog",
+					"hide_border": 1
+				},
+				{
+					fieldname: 'items_for_po', fieldtype: 'Table', label: 'Select Items',
 					fields: [
 						{
 							fieldtype:'Data',
@@ -584,8 +597,8 @@
 						},
 						{
 							fieldtype:'Float',
-							fieldname:'qty',
-							label: __('Quantity'),
+							fieldname:'pending_qty',
+							label: __('Pending Qty'),
 							read_only: 1,
 							in_list_view:1
 						},
@@ -594,60 +607,86 @@
 							read_only:1,
 							fieldname:'uom',
 							label: __('UOM'),
+							in_list_view:1,
+						},
+						{
+							fieldtype:'Data',
+							fieldname:'supplier',
+							label: __('Supplier'),
+							read_only:1,
 							in_list_view:1
-						}
+						},
 					],
-					data: cur_frm.doc.items,
-					get_data: function() {
-						return cur_frm.doc.items
-					}
-				},
-
-				{"fieldtype": "Button", "label": __('Create Purchase Order'), "fieldname": "make_purchase_order", "cssClass": "btn-primary"},
-			]
-		});
-
-		dialog.fields_dict.make_purchase_order.$input.click(function() {
-			var args = dialog.get_values();
-			let selected_items = dialog.fields_dict.items_for_po.grid.get_selected_children()
-			if(selected_items.length == 0) {
-				frappe.throw({message: 'Please select Item form Table', title: __('Message'), indicator:'blue'})
-			}
-			let selected_items_list = []
-			for(let i in selected_items){
-				selected_items_list.push(selected_items[i].item_code)
-			}
-			dialog.hide();
-			return frappe.call({
-				type: "GET",
-				method: "erpnext.selling.doctype.sales_order.sales_order.make_purchase_order",
-				args: {
-					"source_name": me.frm.doc.name,
-					"for_supplier": args.supplier,
-					"selected_items": selected_items_list
-				},
-				freeze: true,
-				callback: function(r) {
-					if(!r.exc) {
-						// var args = dialog.get_values();
-						if (args.supplier){
-							var doc = frappe.model.sync(r.message);
-							frappe.set_route("Form", r.message.doctype, r.message.name);
-						}
-						else{
-							frappe.route_options = {
-								"sales_order": me.frm.doc.name
-							}
-							frappe.set_route("List", "Purchase Order");
-						}
-					}
+					data: me.frm.doc.items.map((item) =>{
+						item.pending_qty = (flt(item.stock_qty) - flt(item.ordered_qty)) / flt(item.conversion_factor);
+						return item;
+					}).filter((item) => {return item.pending_qty > 0;})
 				}
-			})
+			],
+			primary_action_label: 'Create Purchase Order',
+			primary_action (args) {
+				if (!args) return;
+				let selected_items = dialog.fields_dict.items_for_po.grid.get_selected_children();
+				if(selected_items.length == 0) {
+					frappe.throw({message: 'Please select Items from the Table', title: __('Items Required'), indicator:'blue'})
+				}
+
+				dialog.hide();
+
+				var method = args.against_default_supplier ? "make_purchase_order_for_default_supplier" : "make_purchase_order"
+				return frappe.call({
+					type: "GET",
+					method: "erpnext.selling.doctype.sales_order.sales_order." + method,
+					args: {
+						"source_name": me.frm.doc.name,
+						"selected_items": selected_items
+					},
+					freeze: true,
+					callback: function(r) {
+						if(!r.exc) {
+							if (!args.against_default_supplier) {
+								frappe.model.sync(r.message);
+								frappe.set_route("Form", r.message.doctype, r.message.name);
+							}
+							else {
+								frappe.route_options = {
+									"sales_order": me.frm.doc.name
+								}
+								frappe.set_route("List", "Purchase Order");
+							}
+						}
+					}
+				})
+			}
 		});
-		dialog.get_field("items_for_po").grid.only_sortable()
-		dialog.get_field("items_for_po").refresh()
+
+		dialog.fields_dict["against_default_supplier"].df.onchange = () => {
+			console.log("yo");
+			var against_default_supplier = dialog.get_value("against_default_supplier");
+			var items_for_po = dialog.get_value("items_for_po");
+
+			if (against_default_supplier) {
+				let items_with_supplier = items_for_po.filter((item) => item.supplier)
+
+				dialog.fields_dict["items_for_po"].df.data = items_with_supplier;
+				dialog.get_field("items_for_po").refresh();
+			} else {
+				let pending_items = me.frm.doc.items.map((item) =>{
+					item.pending_qty = (flt(item.stock_qty) - flt(item.ordered_qty)) / flt(item.conversion_factor);
+					return item;
+					}).filter((item) => {return item.pending_qty > 0;});
+
+				dialog.fields_dict["items_for_po"].df.data = pending_items;
+				dialog.get_field("items_for_po").refresh();
+			}
+		}
+
+		dialog.get_field("items_for_po").grid.only_sortable();
+		dialog.get_field("items_for_po").refresh();
+		dialog.wrapper.find('.grid-heading-row .grid-row-check').click();
 		dialog.show();
 	},
+
 	hold_sales_order: function(){
 		var me = this;
 		var d = new frappe.ui.Dialog({
diff --git a/erpnext/selling/doctype/sales_order/sales_order.py b/erpnext/selling/doctype/sales_order/sales_order.py
index 0dd548c..6ac4ada 100755
--- a/erpnext/selling/doctype/sales_order/sales_order.py
+++ b/erpnext/selling/doctype/sales_order/sales_order.py
@@ -5,7 +5,7 @@
 import frappe
 import json
 import frappe.utils
-from frappe.utils import cstr, flt, getdate, cint, nowdate, add_days, get_link_to_form
+from frappe.utils import cstr, flt, getdate, cint, nowdate, add_days, get_link_to_form, strip_html
 from frappe import _
 from six import string_types
 from frappe.model.utils import get_fetch_values
@@ -442,25 +442,19 @@
 		for item in self.items:
 			if item.ensure_delivery_based_on_produced_serial_no:
 				if item.item_code in normal_items:
-					frappe.throw(_("Cannot ensure delivery by Serial No as \
-					Item {0} is added with and without Ensure Delivery by \
-					Serial No.").format(item.item_code))
+					frappe.throw(_("Cannot ensure delivery by Serial No as Item {0} is added with and without Ensure Delivery by Serial No.").format(item.item_code))
 				if item.item_code not in reserved_items:
 					if not frappe.get_cached_value("Item", item.item_code, "has_serial_no"):
-						frappe.throw(_("Item {0} has no Serial No. Only serilialized items \
-						can have delivery based on Serial No").format(item.item_code))
+						frappe.throw(_("Item {0} has no Serial No. Only serilialized items can have delivery based on Serial No").format(item.item_code))
 					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))
+						frappe.throw(_("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:
 				normal_items.append(item.item_code)
 
 			if not item.ensure_delivery_based_on_produced_serial_no and \
 				item.item_code in reserved_items:
-				frappe.throw(_("Cannot ensure delivery by Serial No as \
-				Item {0} is added with and without Ensure Delivery by \
-				Serial No.").format(item.item_code))
+				frappe.throw(_("Cannot ensure delivery by Serial No as Item {0} is added with and without Ensure Delivery by Serial No.").format(item.item_code))
 
 def get_list_context(context=None):
 	from erpnext.controllers.website_list_for_contact import get_list_context
@@ -784,7 +778,7 @@
 	return data
 
 @frappe.whitelist()
-def make_purchase_order(source_name, for_supplier=None, selected_items=[], target_doc=None):
+def make_purchase_order_for_default_supplier(source_name, selected_items=[], target_doc=None):
 	if isinstance(selected_items, string_types):
 		selected_items = json.loads(selected_items)
 
@@ -821,24 +815,21 @@
 
 	def update_item(source, target, source_parent):
 		target.schedule_date = source.delivery_date
-		target.qty = flt(source.qty) - flt(source.ordered_qty)
-		target.stock_qty = (flt(source.qty) - flt(source.ordered_qty)) * flt(source.conversion_factor)
+		target.qty = flt(source.qty) - (flt(source.ordered_qty) / flt(source.conversion_factor))
+		target.stock_qty = (flt(source.stock_qty) - flt(source.ordered_qty))
 		target.project = source_parent.project
 
-	suppliers =[]
-	if for_supplier:
-		suppliers.append(for_supplier)
-	else:
-		sales_order = frappe.get_doc("Sales Order", source_name)
-		for item in sales_order.items:
-			if item.supplier and item.supplier not in suppliers:
-				suppliers.append(item.supplier)
+	suppliers = [item.get('supplier') for item in selected_items if item.get('supplier') and item.get('supplier')]
+	suppliers = list(set(suppliers))
+
+	items_to_map = [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))
 
 	if not suppliers:
 		frappe.throw(_("Please set a Supplier against the Items to be considered in the Purchase Order."))
 
 	for supplier in suppliers:
-		po =frappe.get_list("Purchase Order", filters={"sales_order":source_name, "supplier":supplier, "docstatus": ("<", "2")})
+		po = frappe.get_list("Purchase Order", filters={"sales_order":source_name, "supplier":supplier, "docstatus": ("<", "2")})
 		if len(po) == 0:
 			doc = get_mapped_doc("Sales Order", source_name, {
 				"Sales Order": {
@@ -849,7 +840,8 @@
 						"contact_mobile",
 						"contact_email",
 						"contact_person",
-						"taxes_and_charges"
+						"taxes_and_charges",
+						"shipping_address"
 					],
 					"validation": {
 						"docstatus": ["=", 1]
@@ -871,52 +863,82 @@
 						"item_tax_template"
 					],
 					"postprocess": update_item,
-					"condition": lambda doc: doc.ordered_qty < doc.qty and doc.supplier == supplier and doc.item_code in selected_items
+					"condition": lambda doc: doc.ordered_qty < doc.stock_qty and doc.supplier == supplier and doc.item_code in items_to_map
 				}
 			}, target_doc, set_missing_values)
-			if not for_supplier:
-				doc.insert()
+
+			doc.insert()
 		else:
 			suppliers =[]
 	if suppliers:
-		if not for_supplier:
-			frappe.db.commit()
+		frappe.db.commit()
 		return doc
 	else:
-		frappe.msgprint(_("PO already created for all sales order items"))
-
+		frappe.msgprint(_("Purchase Order already created for all Sales Order items"))
 
 @frappe.whitelist()
-@frappe.validate_and_sanitize_search_inputs
-def get_supplier(doctype, txt, searchfield, start, page_len, filters):
-	supp_master_name = frappe.defaults.get_user_default("supp_master_name")
-	if supp_master_name == "Supplier Name":
-		fields = ["name", "supplier_group"]
-	else:
-		fields = ["name", "supplier_name", "supplier_group"]
-	fields = ", ".join(fields)
+def make_purchase_order(source_name, selected_items=[], target_doc=None):
+	if isinstance(selected_items, string_types):
+		selected_items = json.loads(selected_items)
 
-	return frappe.db.sql("""select {field} from `tabSupplier`
-		where docstatus < 2
-			and ({key} like %(txt)s
-				or supplier_name like %(txt)s)
-			and name in (select supplier from `tabSales Order Item` where parent = %(parent)s)
-			and name not in (select supplier from `tabPurchase Order` po inner join `tabPurchase Order Item` poi
-			     on po.name=poi.parent where po.docstatus<2 and poi.sales_order=%(parent)s)
-		order by
-			if(locate(%(_txt)s, name), locate(%(_txt)s, name), 99999),
-			if(locate(%(_txt)s, supplier_name), locate(%(_txt)s, supplier_name), 99999),
-			name, supplier_name
-		limit %(start)s, %(page_len)s """.format(**{
-			'field': fields,
-			'key': frappe.db.escape(searchfield)
-		}), {
-			'txt': "%%%s%%" % txt,
-			'_txt': txt.replace("%", ""),
-			'start': start,
-			'page_len': page_len,
-			'parent': filters.get('parent')
-		})
+	items_to_map = [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))
+
+	def set_missing_values(source, target):
+		target.supplier = ""
+		target.apply_discount_on = ""
+		target.additional_discount_percentage = 0.0
+		target.discount_amount = 0.0
+		target.inter_company_order_reference = ""
+		target.customer = ""
+		target.customer_name = ""
+		target.run_method("set_missing_values")
+		target.run_method("calculate_taxes_and_totals")
+
+	def update_item(source, target, source_parent):
+		target.schedule_date = source.delivery_date
+		target.qty = flt(source.qty) - (flt(source.ordered_qty) / flt(source.conversion_factor))
+		target.stock_qty = (flt(source.stock_qty) - flt(source.ordered_qty))
+		target.project = source_parent.project
+
+	# po = frappe.get_list("Purchase Order", filters={"sales_order":source_name, "supplier":supplier, "docstatus": ("<", "2")})
+	doc = get_mapped_doc("Sales Order", source_name, {
+		"Sales Order": {
+			"doctype": "Purchase Order",
+			"field_no_map": [
+				"address_display",
+				"contact_display",
+				"contact_mobile",
+				"contact_email",
+				"contact_person",
+				"taxes_and_charges",
+				"shipping_address"
+			],
+			"validation": {
+				"docstatus": ["=", 1]
+			}
+		},
+		"Sales Order Item": {
+			"doctype": "Purchase Order Item",
+			"field_map":  [
+				["name", "sales_order_item"],
+				["parent", "sales_order"],
+				["stock_uom", "stock_uom"],
+				["uom", "uom"],
+				["conversion_factor", "conversion_factor"],
+				["delivery_date", "schedule_date"]
+			],
+			"field_no_map": [
+				"rate",
+				"price_list_rate",
+				"item_tax_template",
+				"supplier"
+			],
+			"postprocess": update_item,
+			"condition": lambda doc: doc.ordered_qty < doc.stock_qty and doc.item_code in items_to_map
+		}
+	}, target_doc, set_missing_values)
+	return doc
 
 @frappe.whitelist()
 def make_work_orders(items, sales_order, company, project=None):
@@ -992,15 +1014,20 @@
 	))
 	for item in raw_materials:
 		item_doc = frappe.get_cached_doc('Item', item.get('item_code'))
+
 		schedule_date = add_days(nowdate(), cint(item_doc.lead_time_days))
-		material_request.append('items', {
-		'item_code': item.get('item_code'),
-		'qty': item.get('quantity'),
-		'schedule_date': schedule_date,
-		'warehouse': item.get('warehouse'),
-		'sales_order': sales_order,
-		'project': project
+		row = material_request.append('items', {
+			'item_code': item.get('item_code'),
+			'qty': item.get('quantity'),
+			'schedule_date': schedule_date,
+			'warehouse': item.get('warehouse'),
+			'sales_order': sales_order,
+			'project': project
 		})
+
+		if not (strip_html(item.get("description")) and strip_html(item_doc.description)):
+			row.description = item_doc.item_name or item.get('item_code')
+
 	material_request.insert()
 	material_request.flags.ignore_permissions = 1
 	material_request.run_method("set_missing_values")
diff --git a/erpnext/selling/doctype/sales_order/test_sales_order.py b/erpnext/selling/doctype/sales_order/test_sales_order.py
index 1ce36dd..9e25ed0 100644
--- a/erpnext/selling/doctype/sales_order/test_sales_order.py
+++ b/erpnext/selling/doctype/sales_order/test_sales_order.py
@@ -403,7 +403,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)
-	
+
 	def test_update_child_with_precision(self):
 		from frappe.model.meta import get_field_precision
 		from frappe.custom.doctype.property_setter.property_setter import make_property_setter
@@ -437,7 +437,7 @@
 		self.assertRaises(frappe.ValidationError, update_child_qty_rate,'Sales Order', trans_item, so.name)
 		test_user.remove_roles("Accounts User")
 		frappe.set_user("Administrator")
-	
+
 	def test_update_child_qty_rate_with_workflow(self):
 		from frappe.model.workflow import apply_workflow
 
@@ -506,6 +506,95 @@
 		so.reload()
 		self.assertEqual(so.packed_items[0].qty, 8)
 
+	def test_update_child_with_tax_template(self):
+		"""
+			Test Action: Create a SO with one item having its tax account head already in the SO.
+			Add the same item + new item with tax template via Update Items.
+			Expected result: First Item's tax row is updated. New tax row is added for second Item.
+		"""
+		if not frappe.db.exists("Item", "Test Item with Tax"):
+			make_item("Test Item with Tax", {
+				'is_stock_item': 1,
+			})
+
+		if not frappe.db.exists("Item Tax Template", {"title": 'Test Update Items Template'}):
+			frappe.get_doc({
+				'doctype': 'Item Tax Template',
+				'title': 'Test Update Items Template',
+				'company': '_Test Company',
+				'taxes': [
+					{
+						'tax_type': "_Test Account Service Tax - _TC",
+						'tax_rate': 10,
+					}
+				]
+			}).insert()
+
+		new_item_with_tax = frappe.get_doc("Item", "Test Item with Tax")
+
+		new_item_with_tax.append("taxes", {
+			"item_tax_template": "Test Update Items Template",
+			"valid_from": nowdate()
+		})
+		new_item_with_tax.save()
+
+		tax_template = "_Test Account Excise Duty @ 10"
+		item =  "_Test Item Home Desktop 100"
+		if not frappe.db.exists("Item Tax", {"parent":item, "item_tax_template":tax_template}):
+			item_doc = frappe.get_doc("Item", item)
+			item_doc.append("taxes", {
+				"item_tax_template": tax_template,
+				"valid_from": nowdate()
+			})
+			item_doc.save()
+		else:
+			# update valid from
+			frappe.db.sql("""UPDATE `tabItem Tax` set valid_from = CURDATE()
+				where parent = %(item)s and item_tax_template = %(tax)s""",
+					{"item": item, "tax": tax_template})
+
+		so = make_sales_order(item_code=item, qty=1, do_not_save=1)
+
+		so.append("taxes", {
+			"account_head": "_Test Account Excise Duty - _TC",
+			"charge_type": "On Net Total",
+			"cost_center": "_Test Cost Center - _TC",
+			"description": "Excise Duty",
+			"doctype": "Sales Taxes and Charges",
+			"rate": 10
+		})
+		so.insert()
+		so.submit()
+
+		self.assertEqual(so.taxes[0].tax_amount, 10)
+		self.assertEqual(so.taxes[0].total, 110)
+
+		old_stock_settings_value = frappe.db.get_single_value("Stock Settings", "default_warehouse")
+		frappe.db.set_value("Stock Settings", None, "default_warehouse", "_Test Warehouse - _TC")
+
+		items = json.dumps([
+			{'item_code' : item, 'rate' : 100, 'qty' : 1, 'docname': so.items[0].name},
+			{'item_code' : item, 'rate' : 200, 'qty' : 1}, # added item whose tax account head already exists in PO
+			{'item_code' : new_item_with_tax.name, 'rate' : 100, 'qty' : 1} # added item whose tax account head  is missing in PO
+		])
+		update_child_qty_rate('Sales Order', items, so.name)
+
+		so.reload()
+		self.assertEqual(so.taxes[0].tax_amount, 40)
+		self.assertEqual(so.taxes[0].total, 440)
+		self.assertEqual(so.taxes[1].account_head, "_Test Account Service Tax - _TC")
+		self.assertEqual(so.taxes[1].tax_amount, 40)
+		self.assertEqual(so.taxes[1].total, 480)
+
+		# teardown
+		frappe.db.sql("""UPDATE `tabItem Tax` set valid_from = NULL
+			where parent = %(item)s and item_tax_template = %(tax)s""", {"item": item, "tax": tax_template})
+		so.cancel()
+		so.delete()
+		new_item_with_tax.delete()
+		frappe.get_doc("Item Tax Template", "Test Update Items Template").delete()
+		frappe.db.set_value("Stock Settings", None, "default_warehouse", old_stock_settings_value)
+
 	def test_warehouse_user(self):
 		frappe.permissions.add_user_permission("Warehouse", "_Test Warehouse 1 - _TC", "test@example.com")
 		frappe.permissions.add_user_permission("Warehouse", "_Test Warehouse 2 - _TC1", "test2@example.com")
@@ -599,12 +688,12 @@
 		frappe.db.set_value("Stock Settings", None, "auto_insert_price_list_rate_if_missing", 1)
 
 	def test_drop_shipping(self):
-		from erpnext.selling.doctype.sales_order.sales_order import make_purchase_order
+		from erpnext.selling.doctype.sales_order.sales_order import make_purchase_order_for_default_supplier, \
+			update_status as so_update_status
 		from erpnext.buying.doctype.purchase_order.purchase_order import update_status
 
-		make_stock_entry(target="_Test Warehouse - _TC", qty=10, rate=100)
+		# make items
 		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 = [
@@ -626,80 +715,61 @@
 		]
 
 		if frappe.db.get_value("Item", "_Test Regular Item", "is_stock_item")==1:
-			make_stock_entry(item="_Test Regular Item", target="_Test Warehouse - _TC", qty=10, rate=100)
+			make_stock_entry(item="_Test Regular Item", target="_Test Warehouse - _TC", qty=2, rate=100)
 
-		#setuo existing qty from bin
-		bin = frappe.get_all("Bin", filters={"item_code": po_item.item_code, "warehouse": "_Test Warehouse - _TC"},
-			fields=["ordered_qty", "reserved_qty"])
-
-		existing_ordered_qty = bin[0].ordered_qty if bin else 0.0
-		existing_reserved_qty = bin[0].reserved_qty if bin else 0.0
-
-		bin = frappe.get_all("Bin", filters={"item_code": dn_item.item_code,
-			"warehouse": "_Test Warehouse - _TC"}, fields=["reserved_qty"])
-
-		existing_reserved_qty_for_dn_item = bin[0].reserved_qty if bin else 0.0
-
-		#create so, po and partial dn
+		#create so, po and dn
 		so = make_sales_order(item_list=so_items, do_not_submit=True)
 		so.submit()
 
-		po = make_purchase_order(so.name, '_Test Supplier', selected_items=[so_items[0]['item_code']])
+		po = make_purchase_order_for_default_supplier(so.name, selected_items=[so_items[0]])
 		po.submit()
 
-		dn = create_dn_against_so(so.name, delivered_qty=1)
+		dn = create_dn_against_so(so.name, delivered_qty=2)
 
 		self.assertEqual(so.customer, po.customer)
 		self.assertEqual(po.items[0].sales_order, so.name)
 		self.assertEqual(po.items[0].item_code, po_item.item_code)
 		self.assertEqual(dn.items[0].item_code, dn_item.item_code)
-
-		#test ordered_qty and reserved_qty
-		bin = frappe.get_all("Bin", filters={"item_code": po_item.item_code, "warehouse": "_Test Warehouse - _TC"},
-			fields=["ordered_qty", "reserved_qty"])
-
-		ordered_qty = bin[0].ordered_qty if bin else 0.0
-		reserved_qty = bin[0].reserved_qty if bin else 0.0
-
-		self.assertEqual(abs(flt(ordered_qty)), existing_ordered_qty)
-		self.assertEqual(abs(flt(reserved_qty)), existing_reserved_qty)
-
-		reserved_qty = frappe.db.get_value("Bin",
-					{"item_code": dn_item.item_code, "warehouse": "_Test Warehouse - _TC"}, "reserved_qty")
-
-		self.assertEqual(abs(flt(reserved_qty)), existing_reserved_qty_for_dn_item + 1)
-
 		#test po_item length
 		self.assertEqual(len(po.items), 1)
 
-		#test per_delivered status
+		# test ordered_qty and reserved_qty for drop ship item
+		bin_po_item = frappe.get_all("Bin", filters={"item_code": po_item.item_code, "warehouse": "_Test Warehouse - _TC"},
+			fields=["ordered_qty", "reserved_qty"])
+
+		ordered_qty = bin_po_item[0].ordered_qty if bin_po_item else 0.0
+		reserved_qty = bin_po_item[0].reserved_qty if bin_po_item else 0.0
+
+		# drop ship PO should not impact bin, test the same
+		self.assertEqual(abs(flt(ordered_qty)), 0)
+		self.assertEqual(abs(flt(reserved_qty)), 0)
+
+		# test per_delivered status
 		update_status("Delivered", po.name)
-		self.assertEqual(flt(frappe.db.get_value("Sales Order", so.name, "per_delivered"), 2), 75.00)
+		self.assertEqual(flt(frappe.db.get_value("Sales Order", so.name, "per_delivered"), 2), 100.00)
+		po.load_from_db()
 
-		#test reserved qty after complete delivery
-		dn = create_dn_against_so(so.name, delivered_qty=1)
-		reserved_qty = frappe.db.get_value("Bin",
-			{"item_code": dn_item.item_code, "warehouse": "_Test Warehouse - _TC"}, "reserved_qty")
-
-		self.assertEqual(abs(flt(reserved_qty)), existing_reserved_qty_for_dn_item)
-
-		#test after closing so
+		# test after closing so
 		so.db_set('status', "Closed")
 		so.update_reserved_qty()
 
-		bin = frappe.get_all("Bin", filters={"item_code": po_item.item_code, "warehouse": "_Test Warehouse - _TC"},
+		# test ordered_qty and reserved_qty for drop ship item after closing so
+		bin_po_item = frappe.get_all("Bin", filters={"item_code": po_item.item_code, "warehouse": "_Test Warehouse - _TC"},
 			fields=["ordered_qty", "reserved_qty"])
 
-		ordered_qty = bin[0].ordered_qty if bin else 0.0
-		reserved_qty = bin[0].reserved_qty if bin else 0.0
+		ordered_qty = bin_po_item[0].ordered_qty if bin_po_item else 0.0
+		reserved_qty = bin_po_item[0].reserved_qty if bin_po_item else 0.0
 
-		self.assertEqual(abs(flt(ordered_qty)), existing_ordered_qty)
-		self.assertEqual(abs(flt(reserved_qty)), existing_reserved_qty)
+		self.assertEqual(abs(flt(ordered_qty)), 0)
+		self.assertEqual(abs(flt(reserved_qty)), 0)
 
-		reserved_qty = frappe.db.get_value("Bin",
-			{"item_code": dn_item.item_code, "warehouse": "_Test Warehouse - _TC"}, "reserved_qty")
-
-		self.assertEqual(abs(flt(reserved_qty)), existing_reserved_qty_for_dn_item)
+		# teardown
+		so_update_status("Draft", so.name)
+		dn.load_from_db()
+		dn.cancel()
+		po.cancel()
+		so.load_from_db()
+		so.cancel()
 
 	def test_reserved_qty_for_closing_so(self):
 		bin = frappe.get_all("Bin", filters={"item_code": "_Test Item", "warehouse": "_Test Warehouse - _TC"},
diff --git a/erpnext/selling/doctype/selling_settings/selling_settings.json b/erpnext/selling/doctype/selling_settings/selling_settings.json
index dcbc074..4044f09 100644
--- a/erpnext/selling/doctype/selling_settings/selling_settings.json
+++ b/erpnext/selling/doctype/selling_settings/selling_settings.json
@@ -63,7 +63,7 @@
   },
   {
    "default": "15",
-   "description": "Auto close Opportunity after 15 days",
+   "description": "Auto close Opportunity after the no. of days mentioned above",
    "fieldname": "close_opportunity_after_days",
    "fieldtype": "Int",
    "label": "Close Opportunity After Days"
@@ -80,18 +80,18 @@
   {
    "fieldname": "so_required",
    "fieldtype": "Select",
-   "label": "Sales Order Required for Sales Invoice & Delivery Note Creation",
+   "label": "Is Sales Order Required for Sales Invoice & Delivery Note Creation?",
    "options": "No\nYes"
   },
   {
    "fieldname": "dn_required",
    "fieldtype": "Select",
-   "label": "Delivery Note Required for Sales Invoice Creation",
+   "label": "Is Delivery Note Required for Sales Invoice Creation?",
    "options": "No\nYes"
   },
   {
    "default": "Each Transaction",
-   "description": "How often should project and company be updated based on Sales Transactions.",
+   "description": "How often should Project and Company be updated based on Sales Transactions?",
    "fieldname": "sales_update_frequency",
    "fieldtype": "Select",
    "label": "Sales Update Frequency",
@@ -108,38 +108,39 @@
    "default": "0",
    "fieldname": "editable_price_list_rate",
    "fieldtype": "Check",
-   "label": "Allow user to edit Price List Rate in transactions"
+   "label": "Allow User to Edit Price List Rate in Transactions"
   },
   {
    "default": "0",
    "fieldname": "allow_multiple_items",
    "fieldtype": "Check",
-   "label": "Allow Item to be added multiple times in a transaction"
+   "label": "Allow Item to Be Added Multiple Times in a Transaction"
   },
   {
    "default": "0",
    "fieldname": "allow_against_multiple_purchase_orders",
    "fieldtype": "Check",
-   "label": "Allow multiple Sales Orders against a Customer's Purchase Order"
+   "label": "Allow Multiple Sales Orders Against a Customer's Purchase Order"
   },
   {
    "default": "0",
    "fieldname": "validate_selling_price",
    "fieldtype": "Check",
-   "label": "Validate Selling Price for Item against Purchase Rate or Valuation Rate"
+   "label": "Validate Selling Price for Item Against Purchase Rate or Valuation Rate"
   },
   {
    "default": "0",
    "fieldname": "hide_tax_id",
    "fieldtype": "Check",
-   "label": "Hide Customer's Tax Id from Sales Transactions"
+   "label": "Hide Customer's Tax ID from Sales Transactions"
   }
  ],
  "icon": "fa fa-cog",
  "idx": 1,
+ "index_web_pages_for_search": 1,
  "issingle": 1,
  "links": [],
- "modified": "2020-06-01 13:58:35.637858",
+ "modified": "2020-10-13 12:12:56.784014",
  "modified_by": "Administrator",
  "module": "Selling",
  "name": "Selling Settings",
diff --git a/erpnext/selling/page/point_of_sale/pos_payment.js b/erpnext/selling/page/point_of_sale/pos_payment.js
index 7f0cabe..ec886d7 100644
--- a/erpnext/selling/page/point_of_sale/pos_payment.js
+++ b/erpnext/selling/page/point_of_sale/pos_payment.js
@@ -9,8 +9,8 @@
 	}
 
 	init_component() {
-        this.prepare_dom();
-        this.initialize_numpad();
+		this.prepare_dom();
+		this.initialize_numpad();
 		this.bind_events();
 		this.attach_shortcuts();
 		
@@ -18,32 +18,32 @@
 
 	prepare_dom() {
 		this.wrapper.append(
-            `<section class="col-span-6 flex shadow rounded payment-section bg-white mx-h-70 h-100 d-none">
+			`<section class="col-span-6 flex shadow rounded payment-section bg-white mx-h-70 h-100 d-none">
 				<div class="flex flex-col p-16 pt-8 pb-8 w-full">
 					<div class="text-grey mb-6 payment-section no-select pointer">
 						PAYMENT METHOD<span class="octicon octicon-chevron-down collapse-indicator"></span>
 					</div>
 					<div class="payment-modes flex flex-wrap"></div>
 					<div class="invoice-details-section"></div>
-                    <div class="flex mt-auto justify-center w-full">
-                        <div class="flex flex-col justify-center flex-1 ml-4">
-                            <div class="flex w-full">
-                                <div class="totals-remarks items-end justify-end flex flex-1">
-                                    <div class="remarks text-md-0 text-grey mr-auto"></div>
-                                    <div class="totals flex justify-end pt-4"></div>
-                                </div>
-                                <div class="number-pad w-40 mb-4 ml-8 d-none"></div>
-                            </div>
-                            <div class="flex items-center justify-center mt-4 submit-order h-16 w-full rounded bg-primary text-md text-white no-select pointer text-bold">
-                                Complete Order
+					<div class="flex mt-auto justify-center w-full">
+							<div class="flex flex-col justify-center flex-1 ml-4">
+							<div class="flex w-full">
+								<div class="totals-remarks items-end justify-end flex flex-1">
+									<div class="remarks text-md-0 text-grey mr-auto"></div>
+									<div class="totals flex justify-end pt-4"></div>
+								</div>
+								<div class="number-pad w-40 mb-4 ml-8 d-none"></div>
+							</div>
+							<div class="flex items-center justify-center mt-4 submit-order h-16 w-full rounded bg-primary text-md text-white no-select pointer text-bold">
+								Complete Order
 							</div>
 							<div class="order-time flex items-center justify-end mt-2 pt-2 pb-2 w-full text-md-0 text-grey no-select pointer d-none"></div>
-                        </div>
-                    </div>
-                </div>
-            </section>`
-        )
-        this.$component = this.wrapper.find('.payment-section');
+						</div>
+					</div>
+				</div>
+			</section>`
+		)
+		this.$component = this.wrapper.find('.payment-section');
 		this.$payment_modes = this.$component.find('.payment-modes');
 		this.$totals_remarks = this.$component.find('.totals-remarks');
 		this.$totals = this.$component.find('.totals');
@@ -174,6 +174,24 @@
 			}
 		})
 
+		frappe.realtime.on("process_phone_payment", function(data) {
+			frappe.dom.unfreeze();
+			cur_frm.reload_doc();
+			let message = data["ResultDesc"];
+			let title = __("Payment Failed");
+
+			if (data["ResultCode"] == 0) {
+				title = __("Payment Received");
+				$('.btn.btn-xs.btn-default[data-fieldname=request_for_payment]').html(`Payment Received`)
+				me.events.submit_invoice();
+			}
+
+			frappe.msgprint({
+				"message": message,
+				"title": title
+			});
+		});
+
 		this.$payment_modes.on('click', '.shortcut', function(e) {
 			const value = $(this).attr('data-value');
 			me.selected_mode.set_value(value);
@@ -509,5 +527,5 @@
 
 	toggle_component(show) {
 		show ? this.$component.removeClass('d-none') : this.$component.addClass('d-none');
-    }
+	}
  }
\ No newline at end of file
diff --git a/erpnext/setup/desk_page/home/home.json b/erpnext/setup/desk_page/home/home.json
index 63cd5c5..9cf9f41 100644
--- a/erpnext/setup/desk_page/home/home.json
+++ b/erpnext/setup/desk_page/home/home.json
@@ -43,7 +43,7 @@
   {
    "hidden": 0,
    "label": "Data Import and Settings",
-   "links": "[\n    {\n        \"description\": \"Import Data from CSV / Excel files.\",\n        \"icon\": \"octicon octicon-cloud-upload\",\n        \"label\": \"Import Data\",\n        \"name\": \"Data Import\",\n        \"onboard\": 1,\n        \"type\": \"doctype\"\n    },\n    {\n        \"description\": \"Import Chart Of Accounts from CSV / Excel files\",\n        \"labe\": \"Chart Of Accounts Importer\",\n        \"label\": \"Chart of Accounts Importer\",\n        \"name\": \"Chart of Accounts Importer\",\n        \"onboard\": 1,\n        \"type\": \"doctype\"\n    },\n    {\n        \"description\": \"Letter Heads for print templates.\",\n        \"label\": \"Letter Head\",\n        \"name\": \"Letter Head\",\n        \"onboard\": 1,\n        \"type\": \"doctype\"\n    },\n    {\n        \"description\": \"Add / Manage Email Accounts.\",\n        \"label\": \"Email Account\",\n        \"name\": \"Email Account\",\n        \"onboard\": 1,\n        \"type\": \"doctype\"\n    }\n]"
+   "links": "[\n    {\n        \"description\": \"Import Data from CSV / Excel files.\",\n        \"icon\": \"octicon octicon-cloud-upload\",\n        \"label\": \"Import Data\",\n        \"name\": \"Data Import\",\n        \"onboard\": 1,\n        \"type\": \"doctype\"\n    },\n    {\n        \"description\": \"Import Chart of Accounts from CSV / Excel files\",\n        \"label\": \"Chart of Accounts Importer\",\n        \"label\": \"Chart of Accounts Importer\",\n        \"name\": \"Chart of Accounts Importer\",\n        \"onboard\": 1,\n        \"type\": \"doctype\"\n    },\n    {\n        \"description\": \"Letter Heads for print templates.\",\n        \"label\": \"Letter Head\",\n        \"name\": \"Letter Head\",\n        \"onboard\": 1,\n        \"type\": \"doctype\"\n    },\n    {\n        \"description\": \"Add / Manage Email Accounts.\",\n        \"label\": \"Email Account\",\n        \"name\": \"Email Account\",\n        \"onboard\": 1,\n        \"type\": \"doctype\"\n    }\n]"
   }
  ],
  "category": "Modules",
diff --git a/erpnext/setup/doctype/company/company.json b/erpnext/setup/doctype/company/company.json
index 4a26a71..40938ea 100644
--- a/erpnext/setup/doctype/company/company.json
+++ b/erpnext/setup/doctype/company/company.json
@@ -261,14 +261,14 @@
   {
    "fieldname": "create_chart_of_accounts_based_on",
    "fieldtype": "Select",
-   "label": "Create Chart Of Accounts Based On",
+   "label": "Create Chart of Accounts Based on",
    "options": "\nStandard Template\nExisting Company"
   },
   {
    "depends_on": "eval:doc.create_chart_of_accounts_based_on===\"Standard Template\"",
    "fieldname": "chart_of_accounts",
    "fieldtype": "Select",
-   "label": "Chart Of Accounts Template",
+   "label": "Chart of Accounts Template",
    "no_copy": 1
   },
   {
diff --git a/erpnext/setup/setup_wizard/data/country_wise_tax.json b/erpnext/setup/setup_wizard/data/country_wise_tax.json
index 19318df..beddaee 100644
--- a/erpnext/setup/setup_wizard/data/country_wise_tax.json
+++ b/erpnext/setup/setup_wizard/data/country_wise_tax.json
@@ -60,14 +60,10 @@
 	},
 
 	"Australia": {
-		"Australia GST1": {
+		"Australia GST": {
 			"account_name": "GST 10%",
 			"tax_rate": 10.00,
 			"default": 1
-		},
-		"Australia GST 2%": {
-			"account_name": "GST 2%",
-			"tax_rate": 2
 		}
 	},
 
@@ -648,10 +644,19 @@
 	},
 
 	"Italy": {
-		"Italy Tax": {
-			"account_name": "VAT",
-			"tax_rate": 22.00
-		}
+		"Italy VAT 22%": {
+			"account_name": "IVA 22%",
+			"tax_rate": 22.00,
+			"default": 1
+		},
+		"Italy VAT 10%":{
+			"account_name": "IVA 10%",
+			"tax_rate": 10.00
+		},
+		"Italy VAT 4%":{
+			"account_name": "IVA 4%",
+			"tax_rate": 4.00
+		}		
 	},
 
 	"Ivory Coast": {
diff --git a/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.js b/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.js
index 21fa4c3..20c6342 100644
--- a/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.js
+++ b/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.js
@@ -7,6 +7,10 @@
 			frm.fields_dict.quotation_series.df.options = frm.doc.__onload.quotation_series;
 			frm.refresh_field("quotation_series");
 		}
+
+		frm.set_query('payment_gateway_account', function() {
+			return { 'filters': { 'payment_channel': "Email" } };
+		});
 	},
 	enabled: function(frm) {
 		if (frm.doc.enabled === 1) {
diff --git a/erpnext/stock/doctype/delivery_note/test_delivery_note.py b/erpnext/stock/doctype/delivery_note/test_delivery_note.py
index 4b04a0a..0168613 100644
--- a/erpnext/stock/doctype/delivery_note/test_delivery_note.py
+++ b/erpnext/stock/doctype/delivery_note/test_delivery_note.py
@@ -57,7 +57,7 @@
 
 		sle = frappe.get_doc("Stock Ledger Entry", {"voucher_type": "Delivery Note", "voucher_no": dn.name})
 
-		self.assertEqual(sle.stock_value_difference, -1*stock_queue[0][1])
+		self.assertEqual(sle.stock_value_difference, flt(-1*stock_queue[0][1], 2))
 
 		self.assertFalse(get_gl_entries("Delivery Note", dn.name))
 
diff --git a/erpnext/stock/doctype/item/item.py b/erpnext/stock/doctype/item/item.py
index a094e6c..3b62c38 100644
--- a/erpnext/stock/doctype/item/item.py
+++ b/erpnext/stock/doctype/item/item.py
@@ -1188,8 +1188,7 @@
 
 	if item_code:
 		item_cache = ItemVariantsCacheManager(item_code)
-		item_cache.clear_cache()
-
+		item_cache.rebuild_cache()
 
 def check_stock_uom_with_bin(item, stock_uom):
 	if stock_uom == frappe.db.get_value("Item", item, "stock_uom"):
diff --git a/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py b/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py
index 4e173ff..faa9dd9 100644
--- a/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py
+++ b/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py
@@ -296,7 +296,7 @@
 						if self.is_return or flt(d.item_tax_amount):
 							loss_account = expenses_included_in_valuation
 						else:
-							loss_account = stock_rbnb
+							loss_account = self.get_company_default("default_expense_account")
 
 						gl_entries.append(self.get_gl_dict({
 							"account": loss_account,
diff --git a/erpnext/stock/doctype/purchase_receipt/test_purchase_receipt.py b/erpnext/stock/doctype/purchase_receipt/test_purchase_receipt.py
index 74a06d8..12c8906 100644
--- a/erpnext/stock/doctype/purchase_receipt/test_purchase_receipt.py
+++ b/erpnext/stock/doctype/purchase_receipt/test_purchase_receipt.py
@@ -6,7 +6,7 @@
 import json
 import frappe, erpnext
 import frappe.defaults
-from frappe.utils import cint, flt, cstr, today, random_string
+from frappe.utils import cint, flt, cstr, today, random_string, add_days
 from erpnext.stock.doctype.purchase_receipt.purchase_receipt import make_purchase_invoice
 from erpnext.stock.doctype.item.test_item import create_item
 from erpnext import set_perpetual_inventory
@@ -665,6 +665,59 @@
 		warehouse.account = ''
 		warehouse.save()
 
+	def test_backdated_purchase_receipt(self):
+		# make purchase receipt for default company
+		make_purchase_receipt(company="_Test Company 4", warehouse="Stores - _TC4")
+
+		# try to make another backdated PR
+		posting_date = add_days(today(), -1)
+		pr = make_purchase_receipt(company="_Test Company 4", warehouse="Stores - _TC4",
+			do_not_submit=True)
+
+		pr.set_posting_time = 1
+		pr.posting_date = posting_date
+		pr.save()
+
+		self.assertRaises(frappe.ValidationError, pr.submit)
+
+		# make purchase receipt for other company backdated
+		pr = make_purchase_receipt(company="_Test Company 5", warehouse="Stores - _TC5",
+			do_not_submit=True)
+
+		pr.set_posting_time = 1
+		pr.posting_date = posting_date
+		pr.submit()
+
+		# Allowed to submit for other company's PR
+		self.assertEqual(pr.docstatus, 1)
+
+	def test_backdated_purchase_receipt_for_same_company_different_warehouse(self):
+			# make purchase receipt for default company
+		make_purchase_receipt(company="_Test Company 4", warehouse="Stores - _TC4")
+
+		# try to make another backdated PR
+		posting_date = add_days(today(), -1)
+		pr = make_purchase_receipt(company="_Test Company 4", warehouse="Stores - _TC4",
+			do_not_submit=True)
+
+		pr.set_posting_time = 1
+		pr.posting_date = posting_date
+		pr.save()
+
+		self.assertRaises(frappe.ValidationError, pr.submit)
+
+		# make purchase receipt for other company backdated
+		pr = make_purchase_receipt(company="_Test Company 4", warehouse="Finished Goods - _TC4",
+			do_not_submit=True)
+
+		pr.set_posting_time = 1
+		pr.posting_date = posting_date
+		pr.submit()
+
+		# Allowed to submit for other company's PR
+		self.assertEqual(pr.docstatus, 1)
+
+
 def get_sl_entries(voucher_type, voucher_no):
 	return frappe.db.sql(""" select actual_qty, warehouse, stock_value_difference
 		from `tabStock Ledger Entry` where voucher_type=%s and voucher_no=%s
diff --git a/erpnext/stock/doctype/stock_entry/stock_entry.py b/erpnext/stock/doctype/stock_entry/stock_entry.py
index a92d04f..9ad3694 100644
--- a/erpnext/stock/doctype/stock_entry/stock_entry.py
+++ b/erpnext/stock/doctype/stock_entry/stock_entry.py
@@ -96,7 +96,7 @@
 		self.update_quality_inspection()
 		if self.work_order and self.purpose == "Manufacture":
 			self.update_so_in_serial_number()
-		
+
 		if self.purpose == 'Material Transfer' and self.add_to_transit:
 			self.set_material_request_transfer_status('In Transit')
 		if self.purpose == 'Material Transfer' and self.outgoing_stock_entry:
@@ -205,7 +205,9 @@
 
 			for f in ("uom", "stock_uom", "description", "item_name", "expense_account",
 				"cost_center", "conversion_factor"):
-					if f in ["stock_uom", "conversion_factor"] or not item.get(f):
+					if f == "stock_uom" or not item.get(f):
+						item.set(f, item_details.get(f))
+					if f == 'conversion_factor' and item.uom == item_details.get('stock_uom'):
 						item.set(f, item_details.get(f))
 
 			if not item.transfer_qty and item.qty:
@@ -849,6 +851,8 @@
 			frappe.throw(_("Posting date and posting time is mandatory"))
 
 		self.set_work_order_details()
+		self.flags.backflush_based_on = frappe.db.get_single_value("Manufacturing Settings",
+			"backflush_raw_materials_based_on")
 
 		if self.bom_no:
 
@@ -865,14 +869,16 @@
 							item["to_warehouse"] = self.pro_doc.wip_warehouse
 					self.add_to_stock_entry_detail(item_dict)
 
-				elif (self.work_order and (self.purpose == "Manufacture" or self.purpose == "Material Consumption for Manufacture")
-					and not self.pro_doc.skip_transfer and backflush_based_on == "Material Transferred for Manufacture"):
+				elif (self.work_order 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"):
 					self.get_transfered_raw_materials()
 
-				elif (self.work_order and backflush_based_on== "BOM" and
-					(self.purpose == "Manufacture" or self.purpose == "Material Consumption for Manufacture")
+				elif (self.work_order 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):
 					self.get_unconsumed_raw_materials()
+
 				else:
 					if not self.fg_completed_qty:
 						frappe.throw(_("Manufacturing Quantity is mandatory"))
@@ -1111,8 +1117,10 @@
 				for d in backflushed_materials.get(item.item_code):
 					if d.get(item.warehouse):
 						if (qty > req_qty):
-							qty = req_qty
-							qty-= d.get(item.warehouse)
+							qty = (qty/trans_qty) * flt(self.fg_completed_qty)
+
+			if cint(frappe.get_cached_value('UOM', item.stock_uom, 'must_be_whole_number')):
+				qty = frappe.utils.ceil(qty)
 
 			if qty > 0:
 				self.add_to_stock_entry_detail({
@@ -1137,12 +1145,24 @@
 		item_dict = self.get_pro_order_required_items(backflush_based_on)
 
 		max_qty = flt(self.pro_doc.qty)
+
+		allow_overproduction = False
+		overproduction_percentage = flt(frappe.db.get_single_value("Manufacturing Settings",
+			"overproduction_percentage_for_work_order"))
+
+		to_transfer_qty = flt(self.pro_doc.material_transferred_for_manufacturing) + flt(self.fg_completed_qty)
+		transfer_limit_qty = max_qty + ((max_qty * overproduction_percentage) / 100)
+
+		if transfer_limit_qty >= to_transfer_qty:
+			allow_overproduction = True
+
 		for item, item_details in iteritems(item_dict):
 			pending_to_issue = flt(item_details.required_qty) - flt(item_details.transferred_qty)
 			desire_to_transfer = flt(self.fg_completed_qty) * flt(item_details.required_qty) / max_qty
 
-			if (desire_to_transfer <= pending_to_issue or
-				(desire_to_transfer > 0 and backflush_based_on == "Material Transferred for Manufacture")):
+			if (desire_to_transfer <= pending_to_issue
+				or (desire_to_transfer > 0 and backflush_based_on == "Material Transferred for Manufacture")
+				or allow_overproduction):
 				item_dict[item]["qty"] = desire_to_transfer
 			elif pending_to_issue > 0:
 				item_dict[item]["qty"] = pending_to_issue
@@ -1303,8 +1323,10 @@
 				for sr in get_serial_nos(item.serial_no):
 					sales_order = frappe.db.get_value("Serial No", sr, "sales_order")
 					if sales_order:
-						frappe.throw(_("Item {0} (Serial No: {1}) cannot be consumed as is reserverd\
-						 to fullfill Sales Order {2}.").format(item.item_code, sr, sales_order))
+						msg = (_("(Serial No: {0}) cannot be consumed as it's reserverd to fullfill Sales Order {1}.")
+							.format(sr, sales_order))
+
+						frappe.throw(_("Item {0} {1}").format(item.item_code, msg))
 
 	def update_transferred_qty(self):
 		if self.purpose == 'Material Transfer' and self.outgoing_stock_entry:
@@ -1370,7 +1392,7 @@
 		if self.outgoing_stock_entry:
 			parent_se = frappe.get_value("Stock Entry", self.outgoing_stock_entry, 'add_to_transit')
 
-		for item in self.items: 
+		for item in self.items:
 			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:
@@ -1430,7 +1452,7 @@
 			if add_to_transit:
 				warehouse = frappe.get_value('Material Request Item', source_doc.material_request_item, 'warehouse')
 				target_doc.t_warehouse = warehouse
-		
+
 		target_doc.s_warehouse = source_doc.t_warehouse
 		target_doc.qty = source_doc.qty - source_doc.transferred_qty
 
diff --git a/erpnext/stock/doctype/stock_entry/test_stock_entry.py b/erpnext/stock/doctype/stock_entry/test_stock_entry.py
index d98870d..9b6744c 100644
--- a/erpnext/stock/doctype/stock_entry/test_stock_entry.py
+++ b/erpnext/stock/doctype/stock_entry/test_stock_entry.py
@@ -795,6 +795,32 @@
 			])
 		)
 
+	def test_conversion_factor_change(self):
+		frappe.db.set_value("Stock Settings", None, "allow_negative_stock", 1)
+		repack_entry = frappe.copy_doc(test_records[3])
+		repack_entry.posting_date = nowdate()
+		repack_entry.posting_time = nowtime()
+		repack_entry.set_stock_entry_type()
+		repack_entry.insert()
+
+		# check current uom and conversion factor
+		self.assertTrue(repack_entry.items[0].uom, "_Test UOM")
+		self.assertTrue(repack_entry.items[0].conversion_factor, 1)
+
+		# change conversion factor
+		repack_entry.items[0].uom = "_Test UOM 1"
+		repack_entry.items[0].stock_uom = "_Test UOM 1"
+		repack_entry.items[0].conversion_factor = 2
+		repack_entry.save()
+		repack_entry.submit()
+
+		self.assertEqual(repack_entry.items[0].conversion_factor, 2)
+		self.assertEqual(repack_entry.items[0].uom, "_Test UOM 1")
+		self.assertEqual(repack_entry.items[0].qty, 50)
+		self.assertEqual(repack_entry.items[0].transfer_qty, 100)
+
+		frappe.db.set_default("allow_negative_stock", 0)
+
 def make_serialized_item(**args):
 	args = frappe._dict(args)
 	se = frappe.copy_doc(test_records[0])
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 7b9c129..ae2e3a1 100644
--- a/erpnext/stock/doctype/stock_entry_detail/stock_entry_detail.json
+++ b/erpnext/stock/doctype/stock_entry_detail/stock_entry_detail.json
@@ -238,7 +238,6 @@
    "oldfieldname": "conversion_factor",
    "oldfieldtype": "Currency",
    "print_hide": 1,
-   "read_only": 1,
    "reqd": 1
   },
   {
@@ -498,15 +497,14 @@
    "depends_on": "eval:parent.purpose===\"Repack\" && doc.t_warehouse",
    "fieldname": "set_basic_rate_manually",
    "fieldtype": "Check",
-   "label": "Set Basic Rate Manually",
-   "show_days": 1,
-   "show_seconds": 1
+   "label": "Set Basic Rate Manually"
   }
  ],
  "idx": 1,
+ "index_web_pages_for_search": 1,
  "istable": 1,
  "links": [],
- "modified": "2020-06-08 12:57:03.172887",
+ "modified": "2020-09-22 17:55:03.384138",
  "modified_by": "Administrator",
  "module": "Stock",
  "name": "Stock Entry Detail",
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 101c6e0..bb356f6 100644
--- a/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py
+++ b/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py
@@ -5,7 +5,7 @@
 from __future__ import unicode_literals
 import frappe
 from frappe import _
-from frappe.utils import flt, getdate, add_days, formatdate
+from frappe.utils import flt, getdate, add_days, formatdate, get_datetime, date_diff
 from frappe.model.document import Document
 from datetime import date
 from erpnext.controllers.item_variant import ItemTemplateCannotHaveStock
@@ -33,6 +33,8 @@
 		self.scrub_posting_time()
 		self.validate_and_set_fiscal_year()
 		self.block_transactions_against_group_warehouse()
+		self.validate_with_last_transaction_posting_time()
+		self.validate_future_posting()
 
 	def on_submit(self):
 		self.check_stock_frozen_date()
@@ -139,6 +141,30 @@
 		from erpnext.stock.utils import is_group_warehouse
 		is_group_warehouse(self.warehouse)
 
+	def validate_with_last_transaction_posting_time(self):
+		last_transaction_time = frappe.db.sql("""
+			select MAX(timestamp(posting_date, posting_time)) as posting_time
+			from `tabStock Ledger Entry`
+			where docstatus = 1 and item_code = %s
+			and warehouse = %s""", (self.item_code, self.warehouse))[0][0]
+
+		cur_doc_posting_datetime = "%s %s" % (self.posting_date, self.get("posting_time") or "00:00:00")
+
+		if last_transaction_time and get_datetime(cur_doc_posting_datetime) < get_datetime(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))
+
+			msg += "<br><br>" + _("Stock Transactions for Item {0} under warehouse {1} cannot be posted before this time.").format(
+				frappe.bold(self.item_code), frappe.bold(self.warehouse))
+
+			msg += "<br><br>" + _("Please remove this item and try to submit again or update the posting time.")
+			frappe.throw(msg, title=_("Backdated Stock Entry"))
+
+	def validate_future_posting(self):
+		if date_diff(self.posting_date, getdate()) > 0:
+			msg = _("Posting future stock transactions are not allowed due to Immutable Ledger")
+			frappe.throw(msg, title=_("Future Posting Not Allowed"))
+
 def on_doctype_update():
 	if not frappe.db.has_index('tabStock Ledger Entry', 'posting_sort_index'):
 		frappe.db.commit()
diff --git a/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.js b/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.js
index ecee97c..e2121fc 100644
--- a/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.js
+++ b/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.js
@@ -109,6 +109,10 @@
 					frappe.model.set_value(cdt, cdn, "current_amount", r.message.rate * r.message.qty);
 					frappe.model.set_value(cdt, cdn, "amount", r.message.rate * r.message.qty);
 					frappe.model.set_value(cdt, cdn, "current_serial_no", r.message.serial_nos);
+
+					if (frm.doc.purpose == "Stock Reconciliation") {
+						frappe.model.set_value(cdt, cdn, "serial_no", r.message.serial_nos);
+					}
 				}
 			});
 		}
diff --git a/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py b/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py
index b81f8a0..00b8f69 100644
--- a/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py
+++ b/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py
@@ -67,6 +67,8 @@
 
 				if item_dict.get("serial_nos"):
 					item.current_serial_no = item_dict.get("serial_nos")
+					if self.purpose == "Stock Reconciliation":
+						item.serial_no = item.current_serial_no
 
 				item.current_qty = item_dict.get("qty")
 				item.current_valuation_rate = item_dict.get("rate")
diff --git a/erpnext/stock/doctype/stock_reconciliation/test_stock_reconciliation.py b/erpnext/stock/doctype/stock_reconciliation/test_stock_reconciliation.py
index 1571416..23d48d4 100644
--- a/erpnext/stock/doctype/stock_reconciliation/test_stock_reconciliation.py
+++ b/erpnext/stock/doctype/stock_reconciliation/test_stock_reconciliation.py
@@ -124,7 +124,7 @@
 		to_delete_records.append(sr.name)
 
 		sr = create_stock_reconciliation(item_code=serial_item_code,
-			warehouse = serial_warehouse, qty=5, rate=300, serial_no = '\n'.join(serial_nos))
+			warehouse = serial_warehouse, qty=5, rate=300)
 
 		serial_nos1 = get_serial_nos(sr.items[0].serial_no)
 		self.assertEqual(len(serial_nos1), 5)
diff --git a/erpnext/stock/doctype/stock_settings/stock_settings.json b/erpnext/stock/doctype/stock_settings/stock_settings.json
index 9c5d3d8..067659f 100644
--- a/erpnext/stock/doctype/stock_settings/stock_settings.json
+++ b/erpnext/stock/doctype/stock_settings/stock_settings.json
@@ -82,7 +82,7 @@
    "options": "FIFO\nMoving Average"
   },
   {
-   "description": "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.",
+   "description": "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.",
    "fieldname": "over_delivery_receipt_allowance",
    "fieldtype": "Float",
    "label": "Over Delivery/Receipt Allowance (%)"
@@ -91,7 +91,7 @@
    "default": "Stop",
    "fieldname": "action_if_quality_inspection_is_not_submitted",
    "fieldtype": "Select",
-   "label": "Action if Quality inspection is not submitted",
+   "label": "Action If Quality Inspection Is Not Submitted",
    "options": "Stop\nWarn"
   },
   {
@@ -114,7 +114,7 @@
    "default": "0",
    "fieldname": "auto_insert_price_list_rate_if_missing",
    "fieldtype": "Check",
-   "label": "Auto insert Price List rate if missing"
+   "label": "Auto Insert Price List Rate If Missing"
   },
   {
    "default": "0",
@@ -130,13 +130,13 @@
    "default": "1",
    "fieldname": "automatically_set_serial_nos_based_on_fifo",
    "fieldtype": "Check",
-   "label": "Automatically Set Serial Nos based on FIFO"
+   "label": "Automatically Set Serial Nos Based on FIFO"
   },
   {
    "default": "1",
    "fieldname": "set_qty_in_transactions_based_on_serial_no_input",
    "fieldtype": "Check",
-   "label": "Set Qty in Transactions based on Serial No Input"
+   "label": "Set Qty in Transactions Based on Serial No Input"
   },
   {
    "fieldname": "auto_material_request",
@@ -147,13 +147,13 @@
    "default": "0",
    "fieldname": "auto_indent",
    "fieldtype": "Check",
-   "label": "Raise Material Request when stock reaches re-order level"
+   "label": "Raise Material Request When Stock Reaches Re-order Level"
   },
   {
    "default": "0",
    "fieldname": "reorder_email_notify",
    "fieldtype": "Check",
-   "label": "Notify by Email on creation of automatic Material Request"
+   "label": "Notify by Email on Creation of Automatic Material Request"
   },
   {
    "fieldname": "freeze_stock_entries",
@@ -168,12 +168,12 @@
   {
    "fieldname": "stock_frozen_upto_days",
    "fieldtype": "Int",
-   "label": "Freeze Stocks Older Than [Days]"
+   "label": "Freeze Stocks Older Than (Days)"
   },
   {
    "fieldname": "stock_auth_role",
    "fieldtype": "Link",
-   "label": "Role Allowed to edit frozen stock",
+   "label": "Role Allowed to Edit Frozen Stock",
    "options": "Role"
   },
   {
@@ -203,20 +203,21 @@
    "default": "0",
    "fieldname": "allow_from_dn",
    "fieldtype": "Check",
-   "label": "Allow Material Transfer From Delivery Note and Sales Invoice"
+   "label": "Allow Material Transfer from Delivery Note to Sales Invoice"
   },
   {
    "default": "0",
    "fieldname": "allow_from_pr",
    "fieldtype": "Check",
-   "label": "Allow Material Transfer From Purchase Receipt and Purchase Invoice"
+   "label": "Allow Material Transfer from Purchase Receipt to Purchase Invoice"
   }
  ],
  "icon": "icon-cog",
  "idx": 1,
+ "index_web_pages_for_search": 1,
  "issingle": 1,
  "links": [],
- "modified": "2020-06-20 11:39:15.344112",
+ "modified": "2020-10-13 10:33:29.147682",
  "modified_by": "Administrator",
  "module": "Stock",
  "name": "Stock Settings",
diff --git a/erpnext/stock/get_item_details.py b/erpnext/stock/get_item_details.py
index 1a7c15e..8d8dcb7 100644
--- a/erpnext/stock/get_item_details.py
+++ b/erpnext/stock/get_item_details.py
@@ -398,6 +398,11 @@
 	else:
 		warehouse = args.get('warehouse')
 
+	if not warehouse:
+		default_warehouse = frappe.db.get_single_value("Stock Settings", "default_warehouse")
+		if frappe.db.get_value("Warehouse", default_warehouse, "company") == args.company:
+			return default_warehouse
+
 	return warehouse
 
 def update_barcode_value(out):
diff --git a/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.js b/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.js
index 2499c80..74b5a5a 100644
--- a/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.js
+++ b/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.js
@@ -4,6 +4,14 @@
 frappe.query_reports["Batch-Wise Balance History"] = {
 	"filters": [
 		{
+			"fieldname":"company",
+			"label": __("Company"),
+			"fieldtype": "Link",
+			"options": "Company",
+			"default": frappe.defaults.get_user_default("Company"),
+			"reqd": 1
+		},
+		{
 			"fieldname":"from_date",
 			"label": __("From Date"),
 			"fieldtype": "Date",
@@ -20,12 +28,46 @@
 			"reqd": 1
 		},
 		{
-			"fieldname": "item",
-			"label": __("Item"),
+			"fieldname":"item_code",
+			"label": __("Item Code"),
 			"fieldtype": "Link",
 			"options": "Item",
-			"width": "80"
-		}
+			"get_query": function() {
+				return {
+					filters: {
+						"has_batch_no": 1
+					}
+				};
+			}
+		},
+		{
+			"fieldname":"warehouse",
+			"label": __("Warehouse"),
+			"fieldtype": "Link",
+			"options": "Warehouse",
+			"get_query": function() {
+				let company = frappe.query_report.get_filter_value('company');
+				return {
+					filters: {
+						"company": company
+					}
+				};
+			}
+		},
+		{
+			"fieldname":"batch_no",
+			"label": __("Batch No"),
+			"fieldtype": "Link",
+			"options": "Batch",
+			"get_query": function() {
+				let item_code = frappe.query_report.get_filter_value('item_code');
+				return {
+					filters: {
+						"item": item_code
+					}
+				};
+			}
+		},
 	],
 	"formatter": function (value, row, column, data, default_formatter) {
 		if (column.fieldname == "Batch" && data && !!data["Batch"]) {
@@ -43,4 +85,4 @@
 
 		frappe.set_route("query-report", "Stock Ledger");
 	}
-}
\ No newline at end of file
+}
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 8f3e246..087c12e 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
@@ -57,6 +57,10 @@
 	else:
 		frappe.throw(_("'To Date' is required"))
 
+	for field in ["item_code", "warehouse", "batch_no", "company"]:
+		if filters.get(field):
+			conditions += " and {0} = {1}".format(field, frappe.db.escape(filters.get(field)))
+
 	return conditions
 
 
diff --git a/erpnext/stock/report/stock_ageing/stock_ageing.py b/erpnext/stock/report/stock_ageing/stock_ageing.py
index 4af3c54..3dc806f 100644
--- a/erpnext/stock/report/stock_ageing/stock_ageing.py
+++ b/erpnext/stock/report/stock_ageing/stock_ageing.py
@@ -16,10 +16,11 @@
 
 	data = []
 	for item, item_dict in iteritems(item_details):
+		earliest_age, latest_age = 0, 0
 
 		fifo_queue = sorted(filter(_func, item_dict["fifo_queue"]), key=_func)
 		details = item_dict["details"]
-		if not fifo_queue or (not item_dict.get("total_qty")): continue
+		if not fifo_queue and (not item_dict.get("total_qty")): continue
 
 		average_age = get_average_age(fifo_queue, to_date)
 		earliest_age = date_diff(to_date, fifo_queue[0][1])
@@ -60,7 +61,7 @@
 	range1 = range2 = range3 = above_range3 = 0.0
 	for item in fifo_queue:
 		age = date_diff(to_date, item[1])
-		
+
 		if age <= filters.range1:
 			range1 += flt(item[0])
 		elif age <= filters.range2:
@@ -69,7 +70,7 @@
 			range3 += flt(item[0])
 		else:
 			above_range3 += flt(item[0])
-		
+
 	return range1, range2, range3, above_range3
 
 def get_columns(filters):
@@ -170,7 +171,8 @@
 		item_details.setdefault(key, {"details": d, "fifo_queue": []})
 		fifo_queue = item_details[key]["fifo_queue"]
 
-		transferred_item_details.setdefault((d.voucher_no, d.name), [])
+		transferred_item_key = (d.voucher_no, d.name, d.warehouse)
+		transferred_item_details.setdefault(transferred_item_key, [])
 
 		if d.voucher_type == "Stock Reconciliation":
 			d.actual_qty = flt(d.qty_after_transaction) - flt(item_details[key].get("qty_after_transaction", 0))
@@ -178,10 +180,10 @@
 		serial_no_list = get_serial_nos(d.serial_no) if d.serial_no else []
 
 		if d.actual_qty > 0:
-			if transferred_item_details.get((d.voucher_no, d.name)):
-				batch = transferred_item_details[(d.voucher_no, d.name)][0]
+			if transferred_item_details.get(transferred_item_key):
+				batch = transferred_item_details[transferred_item_key][0]
 				fifo_queue.append(batch)
-				transferred_item_details[((d.voucher_no, d.name))].pop(0)
+				transferred_item_details[transferred_item_key].pop(0)
 			else:
 				if serial_no_list:
 					for serial_no in serial_no_list:
@@ -205,11 +207,11 @@
 						# if batch qty > 0
 						# not enough or exactly same qty in current batch, clear batch
 						qty_to_pop -= flt(batch[0])
-						transferred_item_details[(d.voucher_no, d.name)].append(fifo_queue.pop(0))
+						transferred_item_details[transferred_item_key].append(fifo_queue.pop(0))
 					else:
 						# all from current batch
 						batch[0] = flt(batch[0]) - qty_to_pop
-						transferred_item_details[(d.voucher_no, d.name)].append([qty_to_pop, batch[1]])
+						transferred_item_details[transferred_item_key].append([qty_to_pop, batch[1]])
 						qty_to_pop = 0
 
 		item_details[key]["qty_after_transaction"] = d.qty_after_transaction
diff --git a/erpnext/stock/report/stock_ledger/stock_ledger.py b/erpnext/stock/report/stock_ledger/stock_ledger.py
index fe8ad71..86af5e0 100644
--- a/erpnext/stock/report/stock_ledger/stock_ledger.py
+++ b/erpnext/stock/report/stock_ledger/stock_ledger.py
@@ -7,6 +7,7 @@
 from frappe.utils import cint, flt
 from erpnext.stock.utils import update_included_uom_in_report
 from frappe import _
+from erpnext.stock.doctype.serial_no.serial_no import get_serial_nos
 
 def execute(filters=None):
 	include_uom = filters.get("include_uom")
@@ -24,6 +25,7 @@
 
 	actual_qty = stock_value = 0
 
+	available_serial_nos = {}
 	for sle in sl_entries:
 		item_detail = item_details[sle.item_code]
 
@@ -47,6 +49,9 @@
 			"out_qty": min(sle.actual_qty, 0)
 		})
 
+		if sle.serial_no:
+			update_available_serial_nos(available_serial_nos, sle)
+
 		data.append(sle)
 
 		if include_uom:
@@ -55,6 +60,26 @@
 	update_included_uom_in_report(columns, data, include_uom, conversion_factors)
 	return columns, data
 
+def update_available_serial_nos(available_serial_nos, sle):
+	serial_nos = get_serial_nos(sle.serial_no)
+	key = (sle.item_code, sle.warehouse)
+	if key not in available_serial_nos:
+		available_serial_nos.setdefault(key, [])
+
+	existing_serial_no = available_serial_nos[key]
+	for sn in serial_nos:
+		if sle.actual_qty > 0:
+			if sn in existing_serial_no:
+				existing_serial_no.remove(sn)
+			else:
+				existing_serial_no.append(sn)
+		else:
+			if sn in existing_serial_no:
+				existing_serial_no.remove(sn)
+			else:
+				existing_serial_no.append(sn)
+
+	sle.balance_serial_no = '\n'.join(existing_serial_no)
 
 def get_columns():
 	columns = [
@@ -76,7 +101,8 @@
 		{"label": _("Voucher Type"), "fieldname": "voucher_type", "width": 110},
 		{"label": _("Voucher #"), "fieldname": "voucher_no", "fieldtype": "Dynamic Link", "options": "voucher_type", "width": 100},
 		{"label": _("Batch"), "fieldname": "batch_no", "fieldtype": "Link", "options": "Batch", "width": 100},
-		{"label": _("Serial #"), "fieldname": "serial_no", "fieldtype": "Link", "options": "Serial No", "width": 100},
+		{"label": _("Serial No"), "fieldname": "serial_no", "fieldtype": "Link", "options": "Serial No", "width": 100},
+		{"label": _("Balance Serial No"), "fieldname": "balance_serial_no", "width": 100},
 		{"label": _("Project"), "fieldname": "project", "fieldtype": "Link", "options": "Project", "width": 100},
 		{"label": _("Company"), "fieldname": "company", "fieldtype": "Link", "options": "Company", "width": 110}
 	]
diff --git a/erpnext/templates/emails/request_for_quotation.html b/erpnext/templates/emails/request_for_quotation.html
index b4dfb88..812939a 100644
--- a/erpnext/templates/emails/request_for_quotation.html
+++ b/erpnext/templates/emails/request_for_quotation.html
@@ -1,11 +1,24 @@
-<h3>{{_("Request for Quotation")}}</h3>
+<h4>{{_("Request for Quotation")}}</h4>
+<p>{{ supplier_salutation if supplier_salutation else ''}} {{ supplier_name }},</p>
 <p>{{ message }}</p>
+
+<p>{{_("The Request for Quotation can be accessed by clicking on the following button")}}:</p>
+<p>
+	<button style="border: 1px solid #15c; padding: 6px; border-radius: 5px; background-color: white;">
+		<a href="{{ rfq_link }}" style="color: #15c; text-decoration:none;" target="_blank">Submit your Quotation</a>
+	</button>
+</p><br>
+
+<p>{{_("Regards")}},<br>
+{{ user_fullname }}</p><br>
+
 {% if update_password_link %}
-<p>{{_("Please click on the following link to set your new password")}}:</p>
-<p><a href="{{ update_password_link }}">{{ update_password_link }}</a></p>
-{% else %}
-<p>{{_("The request for quotation can be accessed by clicking on the following link")}}:</p>
-<p><a href="{{ rfq_link }}">Submit your Quotation</a></p>
-{% endif %}
-<p>{{_("Thank you")}},<br>
-{{ user_fullname }}</p>
+
+<p>{{_("Please click on the following button to set your new password")}}:</p>
+<p>
+	<button style="border: 1px solid #15c; padding: 4px; border-radius: 5px; background-color: white;">
+		<a href="{{ update_password_link }}" style="color: #15c; font-size: 12px; text-decoration:none;" target="_blank">{{_("Update Password") }}</a>
+	</button>
+</p>
+
+{% endif %}
\ No newline at end of file
diff --git a/erpnext/translations/af.csv b/erpnext/translations/af.csv
index 7269bd7..c411184 100644
--- a/erpnext/translations/af.csv
+++ b/erpnext/translations/af.csv
@@ -521,7 +521,6 @@
 Chargeble,Chargeble,
 Charges are updated in Purchase Receipt against each item,Kostes word opgedateer in Aankoopontvangste teen elke item,
 "Charges will be distributed proportionately based on item qty or amount, as per your selection","Kostes sal proporsioneel verdeel word op grond van die hoeveelheid of hoeveelheid van die produk, soos per u keuse",
-Chart Of Accounts,Grafiek van rekeninge,
 Chart of Cost Centers,Grafiek van kostesentrums,
 Check all,Kyk alles,
 Checkout,Uitteken,
@@ -581,7 +580,6 @@
 Compensatory Off,Kompenserende Off,
 Compensatory leave request days not in valid holidays,Vergoedingsverlof versoek dae nie in geldige vakansiedae,
 Complaint,klagte,
-Completed Qty can not be greater than 'Qty to Manufacture',Voltooide hoeveelheid kan nie groter wees as &#39;Hoeveelheid om te vervaardig&#39; nie,
 Completion Date,voltooiingsdatum,
 Computer,rekenaar,
 Condition,toestand,
@@ -2033,7 +2031,6 @@
 Please select Charge Type first,Kies asseblief die laastipe eers,
 Please select Company,Kies asseblief Maatskappy,
 Please select Company and Designation,Kies asseblief Maatskappy en Aanwysing,
-Please select Company and Party Type first,Kies asseblief eers Maatskappy- en Partytipe,
 Please select Company and Posting Date to getting entries,Kies asseblief Maatskappy en Posdatum om inskrywings te kry,
 Please select Company first,Kies asseblief Maatskappy eerste,
 Please select Completion Date for Completed Asset Maintenance Log,Kies asseblief Voltooiingsdatum vir voltooide bateonderhoudslog,
@@ -2980,7 +2977,6 @@
 The name of your company for which you are setting up this system.,Die naam van u maatskappy waarvoor u hierdie stelsel opstel.,
 The number of shares and the share numbers are inconsistent,Die aantal aandele en die aandele is onbestaanbaar,
 The payment gateway account in plan {0} is different from the payment gateway account in this payment request,Die betaling gateway rekening in plan {0} verskil van die betaling gateway rekening in hierdie betaling versoek,
-The request for quotation can be accessed by clicking on the following link,Die versoek om kwotasie kan verkry word deur op die volgende skakel te kliek,
 The selected BOMs are not for the same item,Die gekose BOM&#39;s is nie vir dieselfde item nie,
 The selected item cannot have Batch,Die gekose item kan nie Batch hê nie,
 The seller and the buyer cannot be the same,Die verkoper en die koper kan nie dieselfde wees nie,
@@ -3130,7 +3126,6 @@
 Total flexible benefit component amount {0} should not be less than max benefits {1},Die totale bedrag vir komponent van buigsame voordele {0} mag nie minder wees as die maksimum voordele nie {1},
 Total hours: {0},Totale ure: {0},
 Total leaves allocated is mandatory for Leave Type {0},"Totale blare wat toegeken is, is verpligtend vir Verlof Tipe {0}",
-Total weightage assigned should be 100%. It is {0},Totale gewig toegeken moet 100% wees. Dit is {0},
 Total working hours should not be greater than max working hours {0},Totale werksure moet nie groter wees nie as maksimum werksure {0},
 Total {0} ({1}),Totaal {0} ({1}),
 "Total {0} for all items is zero, may be you should change 'Distribute Charges Based On'","Totale {0} vir alle items is nul, mag u verander word &quot;Versprei koste gebaseer op &#39;",
@@ -3544,7 +3539,6 @@
 Company field is required,Ondernemingsveld word vereis,
 Creating Dimensions...,Skep dimensies ...,
 Duplicate entry against the item code {0} and manufacturer {1},Dupliseer inskrywing teen die itemkode {0} en vervaardiger {1},
-Import Chart Of Accounts from CSV / Excel files,Voer rekeningkaart uit CSV / Excel-lêers in,
 Invalid GSTIN! The input you've entered doesn't match the GSTIN format for UIN Holders or Non-Resident OIDAR Service Providers,"Ongeldige GSTIN! Die invoer wat u ingevoer het, stem nie ooreen met die GSTIN-formaat vir UIN-houers of OIDAR-diensverskaffers wat nie inwoon nie",
 Invoice Grand Total,Faktuur groot totaal,
 Last carbon check date cannot be a future date,Die laaste datum vir koolstoftoets kan nie &#39;n toekoms wees nie,
@@ -3921,7 +3915,6 @@
 Plaid public token error,Geplaaste openbare tekenfout,
 Plaid transactions sync error,Gesinkroniseerfout in plaidtransaksies,
 Please check the error log for details about the import errors,Kontroleer die foutlogboek vir meer inligting oor die invoerfoute,
-Please click on the following link to set your new password,Klik asseblief op die volgende skakel om u nuwe wagwoord te stel,
 Please create <b>DATEV Settings</b> for Company <b>{}</b>.,Skep asseblief <b>DATEV-instellings</b> vir die maatskappy <b>{}</b> .,
 Please create adjustment Journal Entry for amount {0} ,Skep &#39;n aanpassingsjoernaalinskrywing vir bedrag {0},
 Please do not create more than 500 items at a time,Moenie meer as 500 items op &#39;n slag skep nie,
@@ -3997,6 +3990,7 @@
 Release date must be in the future,Die datum van vrylating moet in die toekoms wees,
 Relieving Date must be greater than or equal to Date of Joining,Verligtingsdatum moet groter wees as of gelyk wees aan die Datum van aansluiting,
 Rename,hernoem,
+Rename Not Allowed,Hernoem nie toegelaat nie,
 Repayment Method is mandatory for term loans,Terugbetalingsmetode is verpligtend vir termynlenings,
 Repayment Start Date is mandatory for term loans,Aanvangsdatum vir terugbetaling is verpligtend vir termynlenings,
 Report Item,Rapporteer item,
@@ -4043,7 +4037,6 @@
 Select All,Kies Alles,
 Select Difference Account,Kies Verskilrekening,
 Select a Default Priority.,Kies &#39;n standaardprioriteit.,
-Select a Supplier from the Default Supplier List of the items below.,Kies &#39;n verskaffer uit die standaardverskafferlys van die onderstaande items.,
 Select a company,Kies &#39;n maatskappy,
 Select finance book for the item {0} at row {1},Kies finansieringsboek vir die item {0} op ry {1},
 Select only one Priority as Default.,Kies slegs een prioriteit as verstek.,
@@ -4247,7 +4240,6 @@
 Actual ,werklike,
 Add to cart,Voeg by die winkelwagen,
 Budget,begroting,
-Chart Of Accounts Importer,Invoerder van rekeningrekeninge,
 Chart of Accounts,Tabel van rekeninge,
 Customer database.,Kliënt databasis.,
 Days Since Last order,Dae sedert die laaste bestelling,
@@ -4546,7 +4538,6 @@
 Check Supplier Invoice Number Uniqueness,Kontroleer Verskaffer-faktuurnommer Uniekheid,
 Make Payment via Journal Entry,Betaal via Joernaal Inskrywing,
 Unlink Payment on Cancellation of Invoice,Ontkoppel betaling met kansellasie van faktuur,
-Unlink Advance Payment on Cancelation of Order,Ontkoppel vooruitbetaling by kansellasie van bestelling,
 Book Asset Depreciation Entry Automatically,Boekbate-waardeverminderinginskrywing outomaties,
 Automatically Add Taxes and Charges from Item Tax Template,Belasting en heffings word outomaties bygevoeg vanaf die itembelastingsjabloon,
 Automatically Fetch Payment Terms,Haal betalingsvoorwaardes outomaties aan,
@@ -4940,7 +4931,6 @@
 POS Customer Group,POS kliënt groep,
 POS Field,POS veld,
 POS Item Group,POS Item Group,
-[Select],[Kies],
 Company Address,Maatskappyadres,
 Update Stock,Werk Voorraad,
 Ignore Pricing Rule,Ignoreer prysreël,
@@ -6481,7 +6471,6 @@
 Appraisal Template,Appraisal Template,
 For Employee Name,Vir Werknemer Naam,
 Goals,Doelwitte,
-Calculate Total Score,Bereken totale telling,
 Total Score (Out of 5),Totale telling (uit 5),
 "Any other remarks, noteworthy effort that should go in the records.","Enige ander opmerkings, noemenswaardige poging wat in die rekords moet plaasvind.",
 Appraisal Goal,Evalueringsdoel,
@@ -6599,11 +6588,6 @@
 Reason for Leaving,Rede vir vertrek,
 Leave Encashed?,Verlaten verlaat?,
 Encashment Date,Bevestigingsdatum,
-Exit Interview Details,Afhanklike onderhoudsbesonderhede,
-Held On,Aangehou,
-Reason for Resignation,Rede vir bedanking,
-Better Prospects,Beter vooruitsigte,
-Health Concerns,Gesondheid Kommer,
 New Workplace,Nuwe werkplek,
 HR-EAD-.YYYY.-,HR-EAD-.YYYY.-,
 Returned Amount,Terugbetaalde bedrag,
@@ -8239,9 +8223,6 @@
 Manufacturers used in Items,Vervaardigers gebruik in items,
 Limited to 12 characters,Beperk tot 12 karakters,
 MAT-MR-.YYYY.-,MAT-MR-.YYYY.-,
-Set Warehouse,Stel pakhuis,
-Sets 'For Warehouse' in each row of the Items table.,Stel &#39;Vir pakhuis&#39; in elke ry van die Artikeltabel in.,
-Requested For,Gevra vir,
 Partially Ordered,Gedeeltelik bestel,
 Transferred,oorgedra,
 % Ordered,% Bestel,
@@ -8690,8 +8671,6 @@
 Select warehouse for material requests,Kies pakhuis vir materiaalversoeke,
 Transfer Materials For Warehouse {0},Oordragmateriaal vir pakhuis {0},
 Production Plan Material Request Warehouse,Produksieplan Materiaalversoekpakhuis,
-Set From Warehouse,Stel vanaf pakhuis,
-Source Warehouse (Material Transfer),Bronpakhuis (materiaaloordrag),
 Sets 'Source Warehouse' in each row of the items table.,Stel &#39;Bronpakhuis&#39; in elke ry van die artikeltabel in.,
 Sets 'Target Warehouse' in each row of the items table.,Stel &#39;Target Warehouse&#39; in elke ry van die artikeltabel in.,
 Show Cancelled Entries,Wys gekanselleerde inskrywings,
@@ -9157,7 +9136,6 @@
 Is Income Tax Component,Is inkomstebelasting komponent,
 Component properties and references ,Komponenteienskappe en verwysings,
 Additional Salary ,Bykomende salaris,
-Condtion and formula,Kondisie en formule,
 Unmarked days,Ongemerkte dae,
 Absent Days,Afwesige dae,
 Conditions and Formula variable and example,Voorwaardes en formule veranderlike en voorbeeld,
@@ -9444,7 +9422,6 @@
 Please check your Plaid client ID and secret values,Gaan u Plaid-kliënt-ID en geheime waardes na,
 Bank transaction creation error,Fout met die skep van banktransaksies,
 Unit of Measurement,Eenheid van mate,
-Row #{}: Selling rate for item {} is lower than its {}. Selling rate should be atleast {},Ry # {}: die verkoopkoers vir item {} is laer as die {}. Verkoopprys moet ten minste {} wees,
 Fiscal Year {0} Does Not Exist,Fiskale jaar {0} bestaan nie,
 Row # {0}: Returned Item {1} does not exist in {2} {3},Ry # {0}: Teruggestuurde item {1} bestaan nie in {2} {3},
 Valuation type charges can not be marked as Inclusive,Kostes van waardasie kan nie as Inklusief gemerk word nie,
@@ -9598,8 +9575,60 @@
 Response Time for {0} priority in row {1} can't be greater than Resolution Time.,Die responstyd vir {0} prioriteit in ry {1} kan nie langer wees as die resolusietyd nie.,
 {0} is not enabled in {1},{0} is nie geaktiveer in {1},
 Group by Material Request,Groepeer volgens materiaalversoek,
-"Row {0}: For Supplier {0}, Email Address is Required to Send Email",Ry {0}: Vir verskaffer {0} word e-posadres vereis om e-pos te stuur,
 Email Sent to Supplier {0},E-pos gestuur aan verskaffer {0},
 "The Access to Request for Quotation From Portal is Disabled. To Allow Access, Enable it in Portal Settings.",Die toegang tot die versoek vir &#39;n kwotasie vanaf die portaal is uitgeskakel. Skakel dit in Portaalinstellings in om toegang te verleen.,
 Supplier Quotation {0} Created,Kwotasie van verskaffer {0} geskep,
 Valid till Date cannot be before Transaction Date,Geldige bewerkingsdatum kan nie voor transaksiedatum wees nie,
+Unlink Advance Payment on Cancellation of Order,Ontkoppel vooruitbetaling by kansellasie van bestelling,
+"Simple Python Expression, Example: territory != 'All Territories'","Eenvoudige Python-uitdrukking, Voorbeeld: gebied! = &#39;Alle gebiede&#39;",
+Sales Contributions and Incentives,Verkoopsbydraes en aansporings,
+Sourced by Supplier,Van verskaffer verkry,
+Total weightage assigned should be 100%.<br>It is {0},Die totale gewigstoekenning moet 100% wees.<br> Dit is {0},
+Account {0} exists in parent company {1}.,Rekening {0} bestaan in moedermaatskappy {1}.,
+"To overrule this, enable '{0}' in company {1}",Skakel &#39;{0}&#39; in die maatskappy {1} in om dit te oorheers.,
+Invalid condition expression,Ongeldige toestandsuitdrukking,
+Please Select a Company First,Kies eers &#39;n maatskappy,
+Please Select Both Company and Party Type First,Kies asseblief eers die maatskappy en die partytjie,
+Provide the invoice portion in percent,Verskaf die faktuurgedeelte in persent,
+Give number of days according to prior selection,Gee die aantal dae volgens voorafgaande keuse,
+Email Details,E-posbesonderhede,
+"Select a greeting for the receiver. E.g. Mr., Ms., etc.","Kies &#39;n groet vir die ontvanger. Bv. Mnr., Me., Ens.",
+Preview Email,Voorskou e-pos,
+Please select a Supplier,Kies &#39;n verskaffer,
+Supplier Lead Time (days),Leveringstyd (dae),
+"Home, Work, etc.","Huis, werk, ens.",
+Exit Interview Held On,Uitgangsonderhoud gehou,
+Condition and formula,Toestand en formule,
+Sets 'Target Warehouse' in each row of the Items table.,Stel &#39;Target Warehouse&#39; in elke ry van die Items-tabel.,
+Sets 'Source Warehouse' in each row of the Items table.,Stel &#39;Bronpakhuis&#39; in elke ry van die Artikeltabel in.,
+POS Register,POS-register,
+"Can not filter based on POS Profile, if grouped by POS Profile","Kan nie gebaseer op POS-profiel filter nie, indien dit gegroepeer is volgens POS-profiel",
+"Can not filter based on Customer, if grouped by Customer","Kan nie op grond van die klant filter nie, indien dit volgens die klant gegroepeer is",
+"Can not filter based on Cashier, if grouped by Cashier","Kan nie filter op grond van Kassier nie, indien dit gegroepeer is volgens Kassier",
+Payment Method,Betalings metode,
+"Can not filter based on Payment Method, if grouped by Payment Method","Kan nie op grond van die betaalmetode filter nie, indien dit gegroepeer is volgens die betaalmetode",
+Supplier Quotation Comparison,Vergelyking tussen kwotasies van verskaffers,
+Price per Unit (Stock UOM),Prys per eenheid (voorraad UOM),
+Group by Supplier,Groepeer volgens verskaffer,
+Group by Item,Groepeer volgens item,
+Remember to set {field_label}. It is required by {regulation}.,Onthou om {field_label} in te stel. Dit word deur {regulasie} vereis.,
+Enrollment Date cannot be before the Start Date of the Academic Year {0},Inskrywingsdatum kan nie voor die begindatum van die akademiese jaar wees nie {0},
+Enrollment Date cannot be after the End Date of the Academic Term {0},Inskrywingsdatum kan nie na die einddatum van die akademiese termyn {0} wees nie,
+Enrollment Date cannot be before the Start Date of the Academic Term {0},Inskrywingsdatum kan nie voor die begindatum van die akademiese termyn {0} wees nie,
+Posting future transactions are not allowed due to Immutable Ledger,As gevolg van Immutable Ledger word toekomstige transaksies nie toegelaat nie,
+Future Posting Not Allowed,Toekomstige plasing word nie toegelaat nie,
+"To enable Capital Work in Progress Accounting, ","Om rekeningkundige kapitaalwerk moontlik te maak,",
+you must select Capital Work in Progress Account in accounts table,u moet Capital Work in Progress-rekening in die rekeningtabel kies,
+You can also set default CWIP account in Company {},U kan ook die standaard CWIP-rekening instel in die maatskappy {},
+The Request for Quotation can be accessed by clicking on the following button,Toegang tot die versoek vir &#39;n kwotasie is deur op die volgende knoppie te klik,
+Regards,Groete,
+Please click on the following button to set your new password,Klik op die volgende knoppie om u nuwe wagwoord in te stel,
+Update Password,Wagwoord op te dateer,
+Row #{}: Selling rate for item {} is lower than its {}. Selling {} should be atleast {},Ry # {}: die verkoopkoers vir item {} is laer as die {}. Verkoop {} moet ten minste {} wees,
+You can alternatively disable selling price validation in {} to bypass this validation.,U kan ook die validering van verkooppryse in {} deaktiveer om hierdie validering te omseil.,
+Invalid Selling Price,Ongeldige verkoopprys,
+Address needs to be linked to a Company. Please add a row for Company in the Links table.,Adres moet aan &#39;n maatskappy gekoppel word. Voeg asseblief &#39;n ry vir Company in die skakeltabel.,
+Company Not Linked,Maatskappy nie gekoppel nie,
+Import Chart of Accounts from CSV / Excel files,Voer rekeningrekeninge in vanaf CSV / Excel-lêers,
+Completed Qty cannot be greater than 'Qty to Manufacture',Voltooide hoeveelheid kan nie groter wees as &#39;hoeveelheid om te vervaardig&#39;,
+"Row {0}: For Supplier {1}, Email Address is Required to send an email",Ry {0}: Vir verskaffer {1} word e-posadres vereis om &#39;n e-pos te stuur,
diff --git a/erpnext/translations/am.csv b/erpnext/translations/am.csv
index accc23f..08bbbd1 100644
--- a/erpnext/translations/am.csv
+++ b/erpnext/translations/am.csv
@@ -521,7 +521,6 @@
 Chargeble,ቻርጅ,
 Charges are updated in Purchase Receipt against each item,ክፍያዎች እያንዳንዱ ንጥል ላይ የግዢ ደረሰኝ ውስጥ መዘመን ነው,
 "Charges will be distributed proportionately based on item qty or amount, as per your selection","ክፍያዎች ተመጣጣኝ መጠን በእርስዎ ምርጫ መሠረት, ንጥል ብዛት ወይም መጠን ላይ በመመርኮዝ መሰራጨት ይሆናል",
-Chart Of Accounts,መለያዎች ገበታ,
 Chart of Cost Centers,ወጪ ማዕከላት ገበታ,
 Check all,ሁሉንም ይመልከቱ,
 Checkout,ጨርሰህ ውጣ,
@@ -581,7 +580,6 @@
 Compensatory Off,የማካካሻ አጥፋ,
 Compensatory leave request days not in valid holidays,ተቀባይነት ባላቸው በዓላት ውስጥ ክፍያ የማይሰጥ የቀን የጥበቃ ቀን ጥያቄ,
 Complaint,ቅሬታ,
-Completed Qty can not be greater than 'Qty to Manufacture',ይልቅ &#39;ብዛት ለማምረት&#39; ተጠናቋል ብዛት የበለጠ መሆን አይችልም,
 Completion Date,ማጠናቀቂያ ቀን,
 Computer,ኮምፕዩተር,
 Condition,ሁኔታ,
@@ -2033,7 +2031,6 @@
 Please select Charge Type first,በመጀመሪያ የክፍያ አይነት ይምረጡ,
 Please select Company,ኩባንያ ይምረጡ,
 Please select Company and Designation,እባክዎ ኩባንያ እና ዲዛይን ይምረጡ,
-Please select Company and Party Type first,በመጀመሪያ ኩባንያ እና የፓርቲ አይነት ይምረጡ,
 Please select Company and Posting Date to getting entries,እባክዎ ግቤቶችን ለመመዝገብ እባክዎ ኩባንያ እና የድረ-ገጽ ቀንን ይምረጡ,
 Please select Company first,መጀመሪያ ኩባንያ እባክዎ ይምረጡ,
 Please select Completion Date for Completed Asset Maintenance Log,እባክዎን ለተጠናቀቀው የንብረት ጥገና ምዝግብ ማስታወሻ ቀነ-ገደብ ይምረጡ,
@@ -2980,7 +2977,6 @@
 The name of your company for which you are setting up this system.,የእርስዎን ኩባንያ ስም ስለ እናንተ ይህ ሥርዓት ማዋቀር ነው.,
 The number of shares and the share numbers are inconsistent,የአክሲዮኖች ቁጥር እና የማካካሻ ቁጥሮች ወጥ ናቸው,
 The payment gateway account in plan {0} is different from the payment gateway account in this payment request,የክፍያ ዕቅድ ክፍያ በእቅድ {0} ውስጥ በዚህ የክፍያ ጥያቄ ውስጥ ካለው የክፍያ በር መለያ የተለየ ነው።,
-The request for quotation can be accessed by clicking on the following link,ጥቅስ ለማግኘት ጥያቄው በሚከተለው አገናኝ ላይ ጠቅ በማድረግ ሊደረስባቸው ይችላሉ,
 The selected BOMs are not for the same item,የተመረጡት BOMs ተመሳሳይ ንጥል አይደሉም,
 The selected item cannot have Batch,የተመረጠው ንጥል ባች ሊኖረው አይችልም,
 The seller and the buyer cannot be the same,ሻጩ እና ገዢው ተመሳሳይ መሆን አይችሉም,
@@ -3130,7 +3126,6 @@
 Total flexible benefit component amount {0} should not be less than max benefits {1},አጠቃላይ ተለዋዋጭ የድጋፍ አካል መጠን {0} ከከፍተኛው ጥቅሞች በታች መሆን የለበትም {1},
 Total hours: {0},ጠቅላላ ሰዓት: {0},
 Total leaves allocated is mandatory for Leave Type {0},ጠቅላላ ቅጠሎች የተመደቡበት አይነት {0},
-Total weightage assigned should be 100%. It is {0},100% መሆን አለበት የተመደበ ጠቅላላ weightage. ይህ ነው {0},
 Total working hours should not be greater than max working hours {0},ጠቅላላ የሥራ ሰዓቶች ከፍተኛ የሥራ ሰዓት በላይ መሆን የለበትም {0},
 Total {0} ({1}),ጠቅላላ {0} ({1}),
 "Total {0} for all items is zero, may be you should change 'Distribute Charges Based On'","ጠቅላላ {0} ሁሉም ንጥሎች እናንተ &#39;ላይ የተመሠረተ ክፍያዎች ያሰራጩ&#39; መቀየር አለበት ሊሆን ይችላል, ዜሮ ነው",
@@ -3544,7 +3539,6 @@
 Company field is required,የኩባንያው መስክ ያስፈልጋል።,
 Creating Dimensions...,ልኬቶችን በመፍጠር ላይ ...,
 Duplicate entry against the item code {0} and manufacturer {1},በእቃ ኮዱ {0} እና በአምራቹ {1} ላይ የተባዛ ግቤት,
-Import Chart Of Accounts from CSV / Excel files,የመለያዎች ገበታዎችን ከ CSV / የ Excel ፋይሎች ያስመጡ።,
 Invalid GSTIN! The input you've entered doesn't match the GSTIN format for UIN Holders or Non-Resident OIDAR Service Providers,ልክ ያልሆነ GSTIN! ያስገባኸው ግቤት ለ UIN Holders ወይም ነዋሪ ላልሆኑ OIDAR አገልግሎት አቅራቢዎች ከ GSTIN ቅርጸት ጋር አይጣጣምም ፡፡,
 Invoice Grand Total,የክፍያ መጠየቂያ ግራንድ አጠቃላይ።,
 Last carbon check date cannot be a future date,የመጨረሻው የካርቦን ፍተሻ ቀን የወደፊት ቀን ሊሆን አይችልም።,
@@ -3921,7 +3915,6 @@
 Plaid public token error,የተዘበራረቀ የህዝብ የምስጋና የምስክር ወረቀት,
 Plaid transactions sync error,የተዘዋወሩ ግብይቶች የማመሳሰል ስህተት።,
 Please check the error log for details about the import errors,እባክዎን ስለማስመጣት ስህተቶች ዝርዝር ለማግኘት የስህተት ምዝግብ ማስታወሻውን ይመልከቱ ፡፡,
-Please click on the following link to set your new password,አዲሱን የይለፍ ቃል ለማዘጋጀት በሚከተለው አገናኝ ላይ ጠቅ ያድርጉ,
 Please create <b>DATEV Settings</b> for Company <b>{}</b>.,እባክዎ <b>ለኩባንያ የ DATEV ቅንብሮችን</b> ይፍጠሩ <b>{}</b> ።,
 Please create adjustment Journal Entry for amount {0} ,እባክዎ ለቁጥር {0} ማስተካከያ ጆርናል ግቤት ይፍጠሩ,
 Please do not create more than 500 items at a time,እባክዎን በአንድ ጊዜ ከ 500 በላይ እቃዎችን አይፍጠሩ ፡፡,
@@ -3997,6 +3990,7 @@
 Release date must be in the future,የሚለቀቅበት ቀን ለወደፊቱ መሆን አለበት።,
 Relieving Date must be greater than or equal to Date of Joining,የመልሶ ማግኛ ቀን ከተቀላቀለበት ቀን የሚበልጥ ወይም እኩል መሆን አለበት,
 Rename,ዳግም ሰይም,
+Rename Not Allowed,ዳግም መሰየም አልተፈቀደም።,
 Repayment Method is mandatory for term loans,የመክፈያ ዘዴ ለጊዜ ብድሮች አስገዳጅ ነው,
 Repayment Start Date is mandatory for term loans,የመክፈያ መጀመሪያ ቀን ለአበዳሪ ብድሮች አስገዳጅ ነው,
 Report Item,ንጥል ሪፖርት ያድርጉ ፡፡,
@@ -4043,7 +4037,6 @@
 Select All,ሁሉንም ምረጥ,
 Select Difference Account,የልዩ መለያ ይምረጡ።,
 Select a Default Priority.,ነባሪ ቅድሚያ ይምረጡ።,
-Select a Supplier from the Default Supplier List of the items below.,ከዚህ በታች ካሉት ነገሮች ነባሪ አቅራቢ ዝርዝር አቅራቢን ይምረጡ ፡፡,
 Select a company,ኩባንያ ይምረጡ።,
 Select finance book for the item {0} at row {1},ለዕቃው ፋይናንስ መጽሐፍ ይምረጡ {0} ረድፍ {1},
 Select only one Priority as Default.,እንደ ነባሪ አንድ ቅድሚያ የሚሰጠውን ይምረጡ።,
@@ -4247,7 +4240,6 @@
 Actual ,ትክክለኛ,
 Add to cart,ወደ ግዢው ቅርጫት ጨምር,
 Budget,ባጀት,
-Chart Of Accounts Importer,የመለያዎች አስመጪ ገበታ።,
 Chart of Accounts,የአድራሻዎች ዝርዝር,
 Customer database.,የደንበኛ ውሂብ ጎታ.,
 Days Since Last order,የመጨረሻ ትዕዛዝ ጀምሮ ቀናት,
@@ -4546,7 +4538,6 @@
 Check Supplier Invoice Number Uniqueness,ማጣሪያ አቅራቢው የደረሰኝ ቁጥር ልዩ,
 Make Payment via Journal Entry,ጆርናል Entry በኩል ክፍያ አድርግ,
 Unlink Payment on Cancellation of Invoice,የደረሰኝ ስረዛ ላይ ክፍያ አታገናኝ,
-Unlink Advance Payment on Cancelation of Order,በትዕዛዝ መተላለፍ ላይ የቅድሚያ ክፍያ ክፍያን አያላቅቁ።,
 Book Asset Depreciation Entry Automatically,መጽሐፍ የንብረት ዋጋ መቀነስ Entry ሰር,
 Automatically Add Taxes and Charges from Item Tax Template,ከእቃው ግብር አብነት ግብርን እና ክፍያዎች በራስ-ሰር ያክሉ።,
 Automatically Fetch Payment Terms,የክፍያ ውሎችን በራስ-ሰር ያውጡ።,
@@ -4940,7 +4931,6 @@
 POS Customer Group,POS የደንበኛ ቡድን,
 POS Field,POS መስክ,
 POS Item Group,POS ንጥል ቡድን,
-[Select],[ምረጥ],
 Company Address,የኩባንያ አድራሻ,
 Update Stock,አዘምን Stock,
 Ignore Pricing Rule,የዋጋ አሰጣጥ ደንብ ችላ,
@@ -6481,7 +6471,6 @@
 Appraisal Template,ግምገማ አብነት,
 For Employee Name,የሰራተኛ ስም ለ,
 Goals,ግቦች,
-Calculate Total Score,አጠቃላይ ነጥብ አስላ,
 Total Score (Out of 5),(5 ውጪ) አጠቃላይ ነጥብ,
 "Any other remarks, noteworthy effort that should go in the records.","ሌሎች ማንኛውም አስተያየት, መዝገቦች ውስጥ መሄድ ዘንድ ትኩረት የሚስብ ጥረት.",
 Appraisal Goal,ግምገማ ግብ,
@@ -6599,11 +6588,6 @@
 Reason for Leaving,የምትሄድበት ምክንያት,
 Leave Encashed?,Encashed ይውጡ?,
 Encashment Date,Encashment ቀን,
-Exit Interview Details,መውጫ ቃለ ዝርዝሮች,
-Held On,የተያዙ ላይ,
-Reason for Resignation,ሥራ መልቀቅ ለ ምክንያት,
-Better Prospects,የተሻለ ተስፋ,
-Health Concerns,የጤና ሰጋት,
 New Workplace,አዲስ በሥራ ቦታ,
 HR-EAD-.YYYY.-,ሃ-ኤአር-ያዮያን.-,
 Returned Amount,የተመለሰው መጠን,
@@ -8239,9 +8223,6 @@
 Manufacturers used in Items,ንጥሎች ውስጥ ጥቅም ላይ አምራቾች,
 Limited to 12 characters,12 ቁምፊዎች የተገደበ,
 MAT-MR-.YYYY.-,ት እሚል-ያሲ-ያዮያን.-,
-Set Warehouse,መጋዘን ያዘጋጁ,
-Sets 'For Warehouse' in each row of the Items table.,በእቃዎቹ ሰንጠረዥ በእያንዳንዱ ረድፍ ‹ለመጋዘን› ያዘጋጃል ፡፡,
-Requested For,ለ ተጠይቋል,
 Partially Ordered,በከፊል የታዘዘ,
 Transferred,ተላልፈዋል,
 % Ordered,% የዕቃው መረጃ,
@@ -8690,8 +8671,6 @@
 Select warehouse for material requests,ለቁሳዊ ጥያቄዎች መጋዘን ይምረጡ,
 Transfer Materials For Warehouse {0},ቁሳቁሶችን ለመጋዘን ያስተላልፉ {0},
 Production Plan Material Request Warehouse,የምርት እቅድ ቁሳቁስ ጥያቄ መጋዘን,
-Set From Warehouse,ከመጋዘን ተዘጋጅ,
-Source Warehouse (Material Transfer),ምንጭ መጋዘን (ቁሳቁስ ማስተላለፍ),
 Sets 'Source Warehouse' in each row of the items table.,በእያንዲንደ የእቃ ሰንጠረ tableች ረድፍ ውስጥ ‹ምንጭ መጋዘን› ያዘጋጃሌ ፡፡,
 Sets 'Target Warehouse' in each row of the items table.,በእያንዲንደ የጠረጴዛዎች ረድፍ ውስጥ ‹ዒላማ መጋዘን› ያዘጋጃሌ ፡፡,
 Show Cancelled Entries,የተሰረዙ ግቤቶችን አሳይ,
@@ -9157,7 +9136,6 @@
 Is Income Tax Component,የገቢ ግብር አካል ነው,
 Component properties and references ,የአካል ክፍሎች እና ማጣቀሻዎች,
 Additional Salary ,ተጨማሪ ደመወዝ,
-Condtion and formula,መጨናነቅ እና ቀመር,
 Unmarked days,ምልክት ያልተደረገባቸው ቀናት,
 Absent Days,የቀሩ ቀናት,
 Conditions and Formula variable and example,ሁኔታዎች እና የቀመር ተለዋዋጭ እና ምሳሌ,
@@ -9444,7 +9422,6 @@
 Please check your Plaid client ID and secret values,እባክዎ የፕላድ ደንበኛ መታወቂያዎን እና ሚስጥራዊ እሴቶችዎን ያረጋግጡ,
 Bank transaction creation error,የባንክ ግብይት መፍጠር ስህተት,
 Unit of Measurement,የመለኪያ አሃድ,
-Row #{}: Selling rate for item {} is lower than its {}. Selling rate should be atleast {},ረድፍ # {}: ለንጥል የመሸጥ መጠን {} ከእሱ ያነሰ ነው። የመሸጥ መጠን ቢያንስ ቢያንስ መሆን አለበት {},
 Fiscal Year {0} Does Not Exist,የበጀት ዓመት {0} የለም,
 Row # {0}: Returned Item {1} does not exist in {2} {3},ረድፍ # {0}: የተመለሰ ንጥል {1} በ {2} {3} ውስጥ የለም,
 Valuation type charges can not be marked as Inclusive,የዋጋ አሰጣጥ አይነት ክፍያዎች ሁሉን ያካተተ ሆኖ ምልክት ሊደረግባቸው አይቻልም,
@@ -9598,8 +9575,60 @@
 Response Time for {0} priority in row {1} can't be greater than Resolution Time.,የምላሽ ጊዜ ለ {0} በተከታታይ ቅድሚያ የሚሰጠው {1} ከመፍትሔው ጊዜ ሊበልጥ አይችልም።,
 {0} is not enabled in {1},{0} በ {1} ውስጥ አልነቃም,
 Group by Material Request,በቁሳዊ ጥያቄ በቡድን,
-"Row {0}: For Supplier {0}, Email Address is Required to Send Email",ረድፍ {0} ለአቅራቢው {0} ኢሜል ለመላክ የኢሜል አድራሻ ያስፈልጋል,
 Email Sent to Supplier {0},ለአቅራቢ ኢሜይል ተልኳል {0},
 "The Access to Request for Quotation From Portal is Disabled. To Allow Access, Enable it in Portal Settings.",ከመግቢያው የጥቆማ ጥያቄ መዳረሻ ተሰናክሏል ፡፡ መዳረሻን ለመፍቀድ በ Portal ቅንብሮች ውስጥ ያንቁት።,
 Supplier Quotation {0} Created,የአቅራቢ ጥቅስ {0} ተፈጥሯል,
 Valid till Date cannot be before Transaction Date,እስከዛሬ ድረስ የሚሰራ ከግብይት ቀን በፊት መሆን አይችልም,
+Unlink Advance Payment on Cancellation of Order,በትእዛዝ ስረዛ ላይ የቅድሚያ ክፍያ ግንኙነትን ያላቅቁ,
+"Simple Python Expression, Example: territory != 'All Territories'",ቀላል የፓይዘን መግለጫ ፣ ምሳሌ: ክልል! = &#39;ሁሉም ግዛቶች&#39;,
+Sales Contributions and Incentives,የሽያጭ አስተዋፅዖዎች እና ማበረታቻዎች,
+Sourced by Supplier,በአቅራቢው ተነስቷል,
+Total weightage assigned should be 100%.<br>It is {0},የተመደበው አጠቃላይ ክብደት 100% መሆን አለበት ፡፡<br> እሱ {0} ነው,
+Account {0} exists in parent company {1}.,መለያ {0} በወላጅ ኩባንያ ውስጥ አለ {1}።,
+"To overrule this, enable '{0}' in company {1}",ይህንን ለመሻር በኩባንያው ውስጥ {0} ን ያንቁ {1},
+Invalid condition expression,ልክ ያልሆነ ሁኔታ መግለጫ,
+Please Select a Company First,እባክዎ መጀመሪያ አንድ ኩባንያ ይምረጡ,
+Please Select Both Company and Party Type First,እባክዎ መጀመሪያ ሁለቱንም ኩባንያ እና የድግስ ዓይነት ይምረጡ,
+Provide the invoice portion in percent,የክፍያ መጠየቂያውን ክፍል በመቶኛ ያቅርቡ,
+Give number of days according to prior selection,በቀድሞው ምርጫ መሠረት የቀናትን ቁጥር ይስጡ,
+Email Details,የኢሜል ዝርዝሮች,
+"Select a greeting for the receiver. E.g. Mr., Ms., etc.",ለተቀባዩ ሰላምታ ይምረጡ ፡፡ ለምሳሌ ሚስተር ወይዘሮ ወ.ዘ.ተ.,
+Preview Email,ኢሜል ቅድመ እይታ,
+Please select a Supplier,እባክዎ አቅራቢ ይምረጡ,
+Supplier Lead Time (days),የአቅራቢ መሪ ጊዜ (ቀናት),
+"Home, Work, etc.",ቤት ፣ ሥራ ፣ ወዘተ,
+Exit Interview Held On,መውጫ ቃለ መጠይቅ በርቷል,
+Condition and formula,ሁኔታ እና ቀመር,
+Sets 'Target Warehouse' in each row of the Items table.,በእያንዲንደ የእቃ ሰንጠረ rowች ረድፍ ውስጥ ‹ዒላማ መጋዘን› ያዘጋጃሌ ፡፡,
+Sets 'Source Warehouse' in each row of the Items table.,በእያንዲንደ የእቃ ሰንጠረ rowች ረድፍ ውስጥ ‹ምንጭ መጋዘን› ያዘጋጃሌ ፡፡,
+POS Register,POS ይመዝገቡ,
+"Can not filter based on POS Profile, if grouped by POS Profile",በ POS መገለጫ ከተመደቡ በ POS መገለጫ ላይ ተመስርተው ማጣሪያ ማድረግ አይቻልም,
+"Can not filter based on Customer, if grouped by Customer",በደንበኛው ከተመደበ በደንበኛው ላይ የተመሠረተ ማጣሪያ ማድረግ አይቻልም,
+"Can not filter based on Cashier, if grouped by Cashier",በገንዘብ ተቀባዩ ከተመደቡ በገንዘብ ተቀባይ ላይ የተመሠረተ ማጣራት አይቻልም,
+Payment Method,የክፍያ ዘዴ,
+"Can not filter based on Payment Method, if grouped by Payment Method",በክፍያ ዘዴ ከተመደቡ በክፍያ ዘዴው መሠረት ማጣሪያ ማድረግ አይቻልም,
+Supplier Quotation Comparison,የአቅራቢዎች ጥቅስ ንፅፅር,
+Price per Unit (Stock UOM),ዋጋ በአንድ ክፍል (ክምችት UOM),
+Group by Supplier,በአቅራቢ ቡድን,
+Group by Item,በንጥል በቡድን,
+Remember to set {field_label}. It is required by {regulation}.,{Field_label} ን ማቀናበርን ያስታውሱ። በ {ደንብ} ይፈለጋል።,
+Enrollment Date cannot be before the Start Date of the Academic Year {0},የምዝገባ ቀን ከአካዳሚክ አመቱ መጀመሪያ ቀን በፊት መሆን አይችልም {0},
+Enrollment Date cannot be after the End Date of the Academic Term {0},የመመዝገቢያ ቀን ከትምህርታዊ ጊዜ ማብቂያ ቀን በኋላ መሆን አይችልም {0},
+Enrollment Date cannot be before the Start Date of the Academic Term {0},የምዝገባ ቀን ከትምህርቱ ዘመን መጀመሪያ ቀን በፊት መሆን አይችልም {0},
+Posting future transactions are not allowed due to Immutable Ledger,በሚተላለፍ ሊደር ምክንያት የወደፊት ግብይቶችን መለጠፍ አይፈቀድም,
+Future Posting Not Allowed,የወደፊቱ መለጠፍ አልተፈቀደም,
+"To enable Capital Work in Progress Accounting, ",በሂሳብ አያያዝ ውስጥ የካፒታል ሥራን ለማንቃት ፣,
+you must select Capital Work in Progress Account in accounts table,በሂሳብ ሰንጠረዥ ውስጥ በሂሳብ መዝገብ ውስጥ ካፒታል ሥራን መምረጥ አለብዎት,
+You can also set default CWIP account in Company {},እንዲሁም ነባሪ የ CWIP መለያ በኩባንያ ውስጥ ማቀናበር ይችላሉ {},
+The Request for Quotation can be accessed by clicking on the following button,የጥያቄ ጥያቄ የሚከተለውን ቁልፍ በመጫን ማግኘት ይቻላል,
+Regards,ከሰላምታ ጋር,
+Please click on the following button to set your new password,አዲሱን የይለፍ ቃልዎን ለማዘጋጀት እባክዎ በሚከተለው ቁልፍ ላይ ጠቅ ያድርጉ,
+Update Password,የይለፍ ቃል ያዘምኑ,
+Row #{}: Selling rate for item {} is lower than its {}. Selling {} should be atleast {},ረድፍ # {}-ለንጥል የመሸጥ መጠን {} ከእርሷ ያነሰ ነው። መሸጥ {} ቢያንስ ቢያንስ መሆን አለበት {},
+You can alternatively disable selling price validation in {} to bypass this validation.,ይህንን ማረጋገጫ ለማለፍ በ {} ውስጥ የሽያጭ ዋጋ ማረጋገጫውን በአማራጭ ማሰናከል ይችላሉ።,
+Invalid Selling Price,ልክ ያልሆነ የሽያጭ ዋጋ,
+Address needs to be linked to a Company. Please add a row for Company in the Links table.,አድራሻ ከኩባንያ ጋር መገናኘት አለበት ፡፡ እባክዎ በአገናኝስ ሰንጠረዥ ውስጥ ለኩባንያ አንድ ረድፍ ያክሉ።,
+Company Not Linked,ኩባንያ አልተያያዘም,
+Import Chart of Accounts from CSV / Excel files,የመለያዎች ገበታ ከ CSV / Excel ፋይሎች ያስመጡ,
+Completed Qty cannot be greater than 'Qty to Manufacture',የተጠናቀቀው ኪቲ ከ ‹Qty to Manufacturere› ሊበልጥ አይችልም ፡፡,
+"Row {0}: For Supplier {1}, Email Address is Required to send an email",ረድፍ {0} ለአቅራቢ {1} ኢሜል ለመላክ የኢሜል አድራሻ ያስፈልጋል,
diff --git a/erpnext/translations/ar.csv b/erpnext/translations/ar.csv
index 01a135d..51395a2 100644
--- a/erpnext/translations/ar.csv
+++ b/erpnext/translations/ar.csv
@@ -316,7 +316,7 @@
 Auto Material Requests Generated,إنشاء طلب مواد تلقائي,
 Auto Repeat,تكرار تلقائي,
 Auto repeat document updated,تكرار تلقائي للمستندات المحدثة,
-Automotive,سيارات,متحرك بطاقة ذاتية
+Automotive,سيارات,
 Available,متاح,
 Available Leaves,المغادارت والاجازات المتاحة,
 Available Qty,الكمية المتاحة,
@@ -335,10 +335,10 @@
 BOM Browser,قائمة مكونات المواد متصفح,
 BOM No,رقم قائمة مكونات المواد,
 BOM Rate,سعر او معدل قائمة مكونات المواد,
-BOM Stock Report,تقرير مخزون قائمة مكونات المواد,
+BOM Stock Report,تقرير مخزون فاتورة المواد,
 BOM and Manufacturing Quantity are required,مطلوب، قائمة مكونات المواد و كمية التصنيع,
-BOM does not contain any stock item,قائمة مكونات المواد لا تحتوي على أي صنف مخزون,
-BOM {0} does not belong to Item {1},قائمة مكونات المواد {0} لا تنتمي إلى الصنف {1},
+BOM does not contain any stock item,فاتورة الموارد لا تحتوي على أي صنف مخزون,
+BOM {0} does not belong to Item {1},قائمة المواد {0} لا تنتمي إلى الصنف {1},
 BOM {0} must be active,قائمة مكونات المواد {0} يجب أن تكون نشطة\n<br>\nBOM {0} must be active,
 BOM {0} must be submitted,قائمة مكونات المواد {0} يجب أن تكون مسجلة\n<br>\nBOM {0} must be submitted,
 Balance,الموازنة,
@@ -405,7 +405,7 @@
 Black,أسود,
 Blanket Orders from Costumers.,أوامر شراء شاملة من العملاء.,
 Block Invoice,حظر الفاتورة,
-Boms,قوائم مكونات المواد,
+Boms,قوائم المواد,
 Bonus Payment Date cannot be a past date,لا يمكن أن يكون تاريخ الدفع المكافأ تاريخًا سابقًا,
 Both Trial Period Start Date and Trial Period End Date must be set,يجب تعيين كل من تاريخ بدء الفترة التجريبية وتاريخ انتهاء الفترة التجريبية,
 Both Warehouse must belong to same Company,يجب أن ينتمي المستودع إلى نفس الشركة\n<br>\nBoth Warehouse must belong to same Company,
@@ -504,9 +504,9 @@
 Cash or Bank Account is mandatory for making payment entry,الحساب النقدي أو البنكي مطلوب لعمل مدخل بيع <br>Cash or Bank Account is mandatory for making payment entry,
 Cashier Closing,إغلاق أمين الصندوق,
 Casual Leave,أجازة عادية,
-Category,فئة,صنف
+Category,فئة,
 Category Name,اسم التصنيف,
-Caution,الحذر,تحذير
+Caution,الحذر,
 Central Tax,الضريبة المركزية,
 Certification,شهادة,
 Cess,سيس,
@@ -521,7 +521,6 @@
 Chargeble,Chargeble,
 Charges are updated in Purchase Receipt against each item,تحديث الرسوم في اضافة المشتريات لكل صنف,
 "Charges will be distributed proportionately based on item qty or amount, as per your selection",وسيتم توزيع تستند رسوم متناسب على الكمية البند أو كمية، حسب اختيارك,
-Chart Of Accounts,الشجرة المحاسبية,
 Chart of Cost Centers,دليل مراكز التكلفة,
 Check all,حدد الكل,
 Checkout,دفع,
@@ -581,7 +580,6 @@
 Compensatory Off,تعويض,
 Compensatory leave request days not in valid holidays,أيام طلب الإجازة التعويضية ليست في أيام العطل الصالحة,
 Complaint,شكوى,
-Completed Qty can not be greater than 'Qty to Manufacture',"الكمية المصنعة لا يمكن أن تكون أكبر من ""كمية التصنيع""",
 Completion Date,تاريخ الانتهاء,
 Computer,الحاسوب,
 Condition,الحالة,
@@ -1421,13 +1419,13 @@
 Lab Tests and Vital Signs,اختبارات المختبر وعلامات حيوية,
 Lab result datetime cannot be before testing datetime,لا يمكن أن يكون تاريخ نتيجة المختبر سابقا لتاريخ الفحص,
 Lab testing datetime cannot be before collection datetime,لا يمكن أن يكون وقت اختبار المختبر قبل تاريخ جمع البيانات,
-Label,ملصق,'طابع
+Label,ملصق,
 Laboratory,مختبر,
 Language Name,اسم اللغة,
 Large,كبير,
 Last Communication,آخر الاتصالات,
 Last Communication Date,تاريخ الاتصال الأخير,
-Last Name,اسم العائلة او اللقب,
+Last Name,اسم العائلة,
 Last Order Amount,قيمة آخر طلب,
 Last Order Date,تاريخ أخر أمر بيع,
 Last Purchase Price,سعر الشراء الأخير,
@@ -2033,7 +2031,6 @@
 Please select Charge Type first,يرجى تحديد نوع الرسوم أولا,
 Please select Company,الرجاء اختيار شركة \n<br>\nPlease select Company,
 Please select Company and Designation,يرجى تحديد الشركة والتسمية,
-Please select Company and Party Type first,يرجى تحديد الشركة ونوع الطرف المعني أولا,
 Please select Company and Posting Date to getting entries,يرجى تحديد الشركة وتاريخ النشر للحصول على إدخالات,
 Please select Company first,الرجاء تحديد الشركة أولا\n<br>\nPlease select Company first,
 Please select Completion Date for Completed Asset Maintenance Log,يرجى تحديد تاريخ الانتهاء لاستكمال سجل صيانة الأصول,
@@ -2980,7 +2977,6 @@
 The name of your company for which you are setting up this system.,اسم الشركة التي كنت تقوم بإعداد هذا النظام.,
 The number of shares and the share numbers are inconsistent,عدد الأسهم وأعداد الأسهم غير متناسقة,
 The payment gateway account in plan {0} is different from the payment gateway account in this payment request,يختلف حساب بوابة الدفع في الخطة {0} عن حساب بوابة الدفع في طلب الدفع هذا,
-The request for quotation can be accessed by clicking on the following link,طلب للحصول على الاقتباس يمكن الوصول إليها من خلال النقر على الرابط التالي,
 The selected BOMs are not for the same item,قواائم المواد المحددة ليست لنفس البند,
 The selected item cannot have Batch,العنصر المحدد لا يمكن أن يكون دفعة,
 The seller and the buyer cannot be the same,البائع والمشتري لا يمكن أن يكون هو نفسه,
@@ -3130,7 +3126,6 @@
 Total flexible benefit component amount {0} should not be less than max benefits {1},يجب ألا يقل إجمالي مبلغ الفائدة المرنة {0} عن الحد الأقصى للمنافع {1},
 Total hours: {0},مجموع الساعات: {0},
 Total leaves allocated is mandatory for Leave Type {0},إجمالي الإجازات المخصصة إلزامي لنوع الإجازة {0},
-Total weightage assigned should be 100%. It is {0},يجب أن يكون مجموع الترجيح تعيين 100 ٪ . فمن {0},
 Total working hours should not be greater than max working hours {0},عدد ساعات العمل الكلي يجب ألا يكون أكثر من العدد الأقصى لساعات العمل {0},
 Total {0} ({1}),إجمالي {0} ({1}),
 "Total {0} for all items is zero, may be you should change 'Distribute Charges Based On'","إجمالي {0} لجميع العناصر هو صفر، قد يكون عليك تغيير 'توزيع الرسوم على أساس'\n<br>\nTotal {0} for all items is zero, may be you should change 'Distribute Charges Based On'",
@@ -3544,7 +3539,6 @@
 Company field is required,حقل الشركة مطلوب,
 Creating Dimensions...,إنشاء الأبعاد ...,
 Duplicate entry against the item code {0} and manufacturer {1},إدخال مكرر مقابل رمز العنصر {0} والشركة المصنعة {1},
-Import Chart Of Accounts from CSV / Excel files,استيراد الرسم البياني للحسابات من ملفات CSV / Excel,
 Invalid GSTIN! The input you've entered doesn't match the GSTIN format for UIN Holders or Non-Resident OIDAR Service Providers,GSTIN غير صالح! لا يتطابق الإدخال الذي أدخلته مع تنسيق GSTIN لحاملي UIN أو مزودي خدمة OIDAR غير المقيمين,
 Invoice Grand Total,الفاتورة الكبرى المجموع,
 Last carbon check date cannot be a future date,لا يمكن أن يكون تاريخ فحص الكربون الأخير تاريخًا مستقبلاً,
@@ -3830,7 +3824,7 @@
 Loading...,تحميل ...,
 Loan Amount exceeds maximum loan amount of {0} as per proposed securities,يتجاوز مبلغ القرض الحد الأقصى لمبلغ القرض {0} وفقًا للأوراق المالية المقترحة,
 Loan Applications from customers and employees.,طلبات القروض من العملاء والموظفين.,
-Loan Disbursement,صرف قرض,
+Loan Disbursement,إنفاق تمويل,
 Loan Processes,عمليات القرض,
 Loan Security,ضمان القرض,
 Loan Security Pledge,تعهد ضمان القرض,
@@ -3921,7 +3915,6 @@
 Plaid public token error,خطأ رمزي عام منقوش,
 Plaid transactions sync error,خطأ في مزامنة المعاملات المنقوشة,
 Please check the error log for details about the import errors,الرجاء التحقق من سجل الأخطاء للحصول على تفاصيل حول أخطاء الاستيراد,
-Please click on the following link to set your new password,الرجاء الضغط على الرابط التالي لتعيين كلمة المرور الجديدة,
 Please create <b>DATEV Settings</b> for Company <b>{}</b>.,الرجاء إنشاء <b>إعدادات DATEV</b> للشركة <b>{}</b> .,
 Please create adjustment Journal Entry for amount {0} ,الرجاء إنشاء تعديل إدخال دفتر اليومية للمبلغ {0},
 Please do not create more than 500 items at a time,يرجى عدم إنشاء أكثر من 500 عنصر في وقت واحد,
@@ -3997,6 +3990,7 @@
 Release date must be in the future,يجب أن يكون تاريخ الإصدار في المستقبل,
 Relieving Date must be greater than or equal to Date of Joining,يجب أن يكون تاريخ التخفيف أكبر من أو يساوي تاريخ الانضمام,
 Rename,إعادة تسمية,
+Rename Not Allowed,إعادة تسمية غير مسموح به,
 Repayment Method is mandatory for term loans,طريقة السداد إلزامية للقروض لأجل,
 Repayment Start Date is mandatory for term loans,تاريخ بدء السداد إلزامي للقروض لأجل,
 Report Item,بلغ عن شيء,
@@ -4043,7 +4037,6 @@
 Select All,تحديد الكل,
 Select Difference Account,حدد حساب الفرق,
 Select a Default Priority.,حدد أولوية افتراضية.,
-Select a Supplier from the Default Supplier List of the items below.,حدد موردًا من قائمة الموردين الافتراضية للعناصر أدناه.,
 Select a company,اختر شركة,
 Select finance book for the item {0} at row {1},حدد دفتر تمويل للعنصر {0} في الصف {1},
 Select only one Priority as Default.,حدد أولوية واحدة فقط كإعداد افتراضي.,
@@ -4247,7 +4240,6 @@
 Actual ,فعلي,
 Add to cart,أضف إلى السلة,
 Budget,ميزانية,
-Chart Of Accounts Importer,الرسم البياني للحسابات المستورد,
 Chart of Accounts,الشجرة المحاسبية,
 Customer database.,قاعدة بيانات العملاء.,
 Days Since Last order,الأيام منذ آخر طلب,
@@ -4546,7 +4538,6 @@
 Check Supplier Invoice Number Uniqueness,التحقق من رقم الفتورة المرسلة من المورد مميز (ليس متكرر),
 Make Payment via Journal Entry,قم بالدفع عن طريق قيد دفتر اليومية,
 Unlink Payment on Cancellation of Invoice,إلغاء ربط الدفع على إلغاء الفاتورة,
-Unlink Advance Payment on Cancelation of Order,إلغاء ربط الدفع المقدم عند إلغاء الطلب,
 Book Asset Depreciation Entry Automatically,كتاب اهلاك الأُصُول المدخلة تلقائيا,
 Automatically Add Taxes and Charges from Item Tax Template,إضافة الضرائب والرسوم تلقائيا من قالب الضريبة البند,
 Automatically Fetch Payment Terms,جلب شروط الدفع تلقائيًا,
@@ -4940,7 +4931,6 @@
 POS Customer Group,مجموعة عملاء نقطة البيع,
 POS Field,نقاط البيع الميدانية,
 POS Item Group,مجموعة المواد لنقطة البيع,
-[Select],[اختر ],
 Company Address,عنوان الشركة,
 Update Stock,تحديث المخزون,
 Ignore Pricing Rule,تجاهل (قاعدة التسعير),
@@ -6481,7 +6471,6 @@
 Appraisal Template,قالب التقييم,
 For Employee Name,لاسم الموظف,
 Goals,الأهداف,
-Calculate Total Score,حساب النتيجة الإجمالية,
 Total Score (Out of 5),مجموع نقاط (من 5),
 "Any other remarks, noteworthy effort that should go in the records.",أي ملاحظات أخرى، وجهود جديرة بالذكر يجب أن تدون في السجلات.,
 Appraisal Goal,الغاية من التقييم,
@@ -6599,11 +6588,6 @@
 Reason for Leaving,سبب ترك العمل,
 Leave Encashed?,إجازات مصروفة نقداً؟,
 Encashment Date,تاريخ التحصيل,
-Exit Interview Details,تفاصيل مقابلة مغادرة الشركة,
-Held On,عقدت في,
-Reason for Resignation,سبب الاستقالة,
-Better Prospects,آفاق أفضل,
-Health Concerns,شؤون صحية,
 New Workplace,مكان العمل الجديد,
 HR-EAD-.YYYY.-,HR-EAD-.YYYY.-,
 Returned Amount,المبلغ المرتجع,
@@ -8239,9 +8223,6 @@
 Manufacturers used in Items,الشركات المصنعة المستخدمة في الاصناف,
 Limited to 12 characters,تقتصر على 12 حرفا,
 MAT-MR-.YYYY.-,MAT-MR-.YYYY.-,
-Set Warehouse,تعيين المستودع,
-Sets 'For Warehouse' in each row of the Items table.,يعيّن &quot;للمستودع&quot; في كل صف من جدول السلع.,
-Requested For,طلب لل,
 Partially Ordered,طلبت جزئيًا,
 Transferred,نقل,
 % Ordered,٪ تم طلبها,
@@ -8690,8 +8671,6 @@
 Select warehouse for material requests,حدد المستودع لطلبات المواد,
 Transfer Materials For Warehouse {0},نقل المواد للمستودع {0},
 Production Plan Material Request Warehouse,مستودع طلب مواد خطة الإنتاج,
-Set From Warehouse,تعيين من المستودع,
-Source Warehouse (Material Transfer),مستودع المصدر (نقل المواد),
 Sets 'Source Warehouse' in each row of the items table.,يعيّن &quot;مستودع المصدر&quot; في كل صف من جدول العناصر.,
 Sets 'Target Warehouse' in each row of the items table.,يعيّن &quot;المستودع المستهدف&quot; في كل صف من جدول العناصر.,
 Show Cancelled Entries,إظهار الإدخالات الملغاة,
@@ -9157,7 +9136,6 @@
 Is Income Tax Component,هو مكون ضريبة الدخل,
 Component properties and references ,خصائص المكونات والمراجع,
 Additional Salary ,الراتب الإضافي,
-Condtion and formula,الشرط والصيغة,
 Unmarked days,أيام غير محددة,
 Absent Days,أيام الغياب,
 Conditions and Formula variable and example,متغير الشروط والصيغة والمثال,
@@ -9444,7 +9422,6 @@
 Please check your Plaid client ID and secret values,يرجى التحقق من معرّف عميل Plaid والقيم السرية,
 Bank transaction creation error,خطأ في إنشاء معاملة البنك,
 Unit of Measurement,وحدة قياس,
-Row #{}: Selling rate for item {} is lower than its {}. Selling rate should be atleast {},Row # {}: معدل بيع العنصر {} أقل من {}. يجب أن يكون معدل البيع على الأقل {},
 Fiscal Year {0} Does Not Exist,السنة المالية {0} غير موجودة,
 Row # {0}: Returned Item {1} does not exist in {2} {3},الصف رقم {0}: العنصر الذي تم إرجاعه {1} غير موجود في {2} {3},
 Valuation type charges can not be marked as Inclusive,لا يمكن تحديد رسوم نوع التقييم على أنها شاملة,
@@ -9598,8 +9575,60 @@
 Response Time for {0} priority in row {1} can't be greater than Resolution Time.,لا يمكن أن يكون وقت الاستجابة {0} للأولوية في الصف {1} أكبر من وقت الحل.,
 {0} is not enabled in {1},{0} غير ممكّن في {1},
 Group by Material Request,تجميع حسب طلب المواد,
-"Row {0}: For Supplier {0}, Email Address is Required to Send Email",الصف {0}: للمورد {0} ، عنوان البريد الإلكتروني مطلوب لإرسال بريد إلكتروني,
 Email Sent to Supplier {0},تم إرسال بريد إلكتروني إلى المورد {0},
 "The Access to Request for Quotation From Portal is Disabled. To Allow Access, Enable it in Portal Settings.",تم تعطيل الوصول إلى طلب عرض الأسعار من البوابة. للسماح بالوصول ، قم بتمكينه في إعدادات البوابة.,
 Supplier Quotation {0} Created,تم إنشاء عرض أسعار المورد {0},
 Valid till Date cannot be before Transaction Date,صالح حتى التاريخ لا يمكن أن يكون قبل تاريخ المعاملة,
+Unlink Advance Payment on Cancellation of Order,إلغاء ربط الدفع المسبق عند إلغاء الطلب,
+"Simple Python Expression, Example: territory != 'All Territories'",تعبير بايثون بسيط ، مثال: إقليم! = &quot;كل الأقاليم&quot;,
+Sales Contributions and Incentives,مساهمات وحوافز المبيعات,
+Sourced by Supplier,مصدرها المورد,
+Total weightage assigned should be 100%.<br>It is {0},يجب أن يكون الوزن الإجمالي المخصص 100٪.<br> إنه {0},
+Account {0} exists in parent company {1}.,الحساب {0} موجود في الشركة الأم {1}.,
+"To overrule this, enable '{0}' in company {1}",لإلغاء هذا ، قم بتمكين &quot;{0}&quot; في الشركة {1},
+Invalid condition expression,تعبير شرط غير صالح,
+Please Select a Company First,الرجاء تحديد شركة أولاً,
+Please Select Both Company and Party Type First,الرجاء تحديد نوع الشركة والحزب أولاً,
+Provide the invoice portion in percent,قم بتوفير جزء الفاتورة بالنسبة المئوية,
+Give number of days according to prior selection,أعط عدد الأيام حسب الاختيار المسبق,
+Email Details,تفاصيل البريد الإلكتروني,
+"Select a greeting for the receiver. E.g. Mr., Ms., etc.",حدد تحية للمتلقي. على سبيل المثال السيد ، السيدة ، إلخ.,
+Preview Email,معاينة البريد الإلكتروني,
+Please select a Supplier,الرجاء اختيار مورد,
+Supplier Lead Time (days),مهلة المورد (أيام),
+"Home, Work, etc.",المنزل والعمل وما إلى ذلك.,
+Exit Interview Held On,أجريت مقابلة الخروج,
+Condition and formula,الشرط والصيغة,
+Sets 'Target Warehouse' in each row of the Items table.,يعيّن &quot;المستودع المستهدف&quot; في كل صف من جدول السلع.,
+Sets 'Source Warehouse' in each row of the Items table.,يعيّن &quot;مستودع المصدر&quot; في كل صف من جدول السلع.,
+POS Register,سجل نقاط البيع,
+"Can not filter based on POS Profile, if grouped by POS Profile",لا يمكن التصفية بناءً على ملف تعريف نقطة البيع ، إذا تم تجميعها حسب ملف تعريف نقطة البيع,
+"Can not filter based on Customer, if grouped by Customer",لا يمكن التصفية بناءً على العميل ، إذا تم تجميعه بواسطة العميل,
+"Can not filter based on Cashier, if grouped by Cashier",لا يمكن التصفية على أساس Cashier ، إذا تم تجميعها بواسطة Cashier,
+Payment Method,طريقة الدفع او السداد,
+"Can not filter based on Payment Method, if grouped by Payment Method",لا يمكن التصفية بناءً على طريقة الدفع ، إذا تم تجميعها حسب طريقة الدفع,
+Supplier Quotation Comparison,مقارنة عروض أسعار الموردين,
+Price per Unit (Stock UOM),السعر لكل وحدة (المخزون UOM),
+Group by Supplier,تجميع حسب المورد,
+Group by Item,تجميع حسب البند,
+Remember to set {field_label}. It is required by {regulation}.,تذكر أن تقوم بتعيين {field_label}. مطلوب بموجب {لائحة}.,
+Enrollment Date cannot be before the Start Date of the Academic Year {0},لا يمكن أن يكون تاريخ التسجيل قبل تاريخ بدء العام الأكاديمي {0},
+Enrollment Date cannot be after the End Date of the Academic Term {0},لا يمكن أن يكون تاريخ التسجيل بعد تاريخ انتهاء الفصل الدراسي {0},
+Enrollment Date cannot be before the Start Date of the Academic Term {0},لا يمكن أن يكون تاريخ التسجيل قبل تاريخ بدء الفصل الدراسي {0},
+Posting future transactions are not allowed due to Immutable Ledger,لا يُسمح بنشر المعاملات المستقبلية بسبب دفتر الأستاذ غير القابل للتغيير,
+Future Posting Not Allowed,النشر في المستقبل غير مسموح به,
+"To enable Capital Work in Progress Accounting, ",لتمكين محاسبة الأعمال الرأسمالية الجارية ،,
+you must select Capital Work in Progress Account in accounts table,يجب عليك تحديد حساب رأس المال قيد التقدم في جدول الحسابات,
+You can also set default CWIP account in Company {},يمكنك أيضًا تعيين حساب CWIP الافتراضي في الشركة {},
+The Request for Quotation can be accessed by clicking on the following button,يمكن الوصول إلى طلب عرض الأسعار من خلال النقر على الزر التالي,
+Regards,مع تحياتي,
+Please click on the following button to set your new password,الرجاء النقر فوق الزر التالي لتعيين كلمة المرور الجديدة,
+Update Password,تطوير كلمة السر,
+Row #{}: Selling rate for item {} is lower than its {}. Selling {} should be atleast {},Row # {}: معدل بيع العنصر {} أقل من {}. يجب بيع {} على الأقل {},
+You can alternatively disable selling price validation in {} to bypass this validation.,يمكنك بدلاً من ذلك تعطيل التحقق من سعر البيع في {} لتجاوز هذا التحقق.,
+Invalid Selling Price,سعر البيع غير صالح,
+Address needs to be linked to a Company. Please add a row for Company in the Links table.,يجب ربط العنوان بشركة. الرجاء إضافة صف للشركة في جدول الروابط.,
+Company Not Linked,شركة غير مرتبطة,
+Import Chart of Accounts from CSV / Excel files,استيراد مخطط الحسابات من ملفات CSV / Excel,
+Completed Qty cannot be greater than 'Qty to Manufacture',لا يمكن أن تكون الكمية المكتملة أكبر من &quot;الكمية إلى التصنيع&quot;,
+"Row {0}: For Supplier {1}, Email Address is Required to send an email",الصف {0}: للمورد {1} ، مطلوب عنوان البريد الإلكتروني لإرسال بريد إلكتروني,
diff --git a/erpnext/translations/bg.csv b/erpnext/translations/bg.csv
index c02c565..7fe4ff5 100644
--- a/erpnext/translations/bg.csv
+++ b/erpnext/translations/bg.csv
@@ -521,7 +521,6 @@
 Chargeble,Chargeble,
 Charges are updated in Purchase Receipt against each item,Такси се обновяват на изкупните Квитанция за всяка стока,
 "Charges will be distributed proportionately based on item qty or amount, as per your selection","Таксите ще бъдат разпределени пропорционално на базата на т Количество или количество, според вашия избор",
-Chart Of Accounts,Сметкоплан,
 Chart of Cost Centers,Списък на Разходни центрове,
 Check all,Избери всичко,
 Checkout,Поръчка,
@@ -581,7 +580,6 @@
 Compensatory Off,Компенсаторни Off,
 Compensatory leave request days not in valid holidays,Компенсаторните отпуски не важат за валидни празници,
 Complaint,оплакване,
-Completed Qty can not be greater than 'Qty to Manufacture',"Изпълнено Количество не може да бъде по-голямо от ""Количество за производство""",
 Completion Date,дата на завършване,
 Computer,компютър,
 Condition,Състояние,
@@ -2033,7 +2031,6 @@
 Please select Charge Type first,Моля изберете вид на разхода първо,
 Please select Company,Моля изберете фирма,
 Please select Company and Designation,"Моля, изберете Company and Designation",
-Please select Company and Party Type first,Моля изберете Company и Party Type първи,
 Please select Company and Posting Date to getting entries,"Моля, изберете Фирма и дата на публикуване, за да получавате записи",
 Please select Company first,"Моля, изберете първо фирма",
 Please select Completion Date for Completed Asset Maintenance Log,"Моля, изберете Дата на завършване на регистрационния дневник за завършено състояние на активите",
@@ -2980,7 +2977,6 @@
 The name of your company for which you are setting up this system.,"Името на Вашата фирма, за която искате да създадете тази система.",
 The number of shares and the share numbers are inconsistent,Броят на акциите и номерата на акциите са неконсистентни,
 The payment gateway account in plan {0} is different from the payment gateway account in this payment request,Профилът на платежния шлюз в плана {0} е различен от профила на платежния шлюз в това искане за плащане,
-The request for quotation can be accessed by clicking on the following link,Искането за котировки могат да бъдат достъпни чрез щракване върху следния линк,
 The selected BOMs are not for the same item,Избраните списъците с материали не са за една и съща позиция,
 The selected item cannot have Batch,Избраният елемент не може да има партида,
 The seller and the buyer cannot be the same,Продавачът и купувачът не могат да бъдат същите,
@@ -3130,7 +3126,6 @@
 Total flexible benefit component amount {0} should not be less than max benefits {1},Общият размер на гъвкавия компонент на обезщетението {0} не трябва да бъде по-малък от максималните ползи {1},
 Total hours: {0},Общо часове: {0},
 Total leaves allocated is mandatory for Leave Type {0},Общото разпределение на листа е задължително за тип &quot;Отпуск&quot; {0},
-Total weightage assigned should be 100%. It is {0},Общо weightage определен да бъде 100%. Това е {0},
 Total working hours should not be greater than max working hours {0},Общо работно време не трябва да са по-големи от работното време макс {0},
 Total {0} ({1}),Общо {0} ({1}),
 "Total {0} for all items is zero, may be you should change 'Distribute Charges Based On'","Общо {0} за всички позиции е равна на нула, може да е необходимо да се промени &quot;Разпределете такси на базата на&quot;",
@@ -3544,7 +3539,6 @@
 Company field is required,Полето на фирмата е задължително,
 Creating Dimensions...,Създаване на размери ...,
 Duplicate entry against the item code {0} and manufacturer {1},Дублиран запис срещу кода на артикула {0} и производителя {1},
-Import Chart Of Accounts from CSV / Excel files,Импортиране на сметкоплан от CSV / Excel файлове,
 Invalid GSTIN! The input you've entered doesn't match the GSTIN format for UIN Holders or Non-Resident OIDAR Service Providers,Невалиден GSTIN! Въведеният от вас вход не съвпада с GSTIN формата за притежатели на UIN или нерезидентни доставчици на услуги OIDAR,
 Invoice Grand Total,Фактура Голяма Обща,
 Last carbon check date cannot be a future date,Последната дата за проверка на въглерода не може да бъде бъдеща дата,
@@ -3921,7 +3915,6 @@
 Plaid public token error,Грешка в обществен маркер,
 Plaid transactions sync error,Грешка при синхронизиране на транзакции,
 Please check the error log for details about the import errors,"Моля, проверете журнала за грешки за подробности относно грешките при импортиране",
-Please click on the following link to set your new password,"Моля, кликнете върху следния линк, за да зададете нова парола",
 Please create <b>DATEV Settings</b> for Company <b>{}</b>.,"Моля, създайте <b>настройките</b> на <b>DATEV</b> за компания <b>{}</b> .",
 Please create adjustment Journal Entry for amount {0} ,"Моля, създайте корекция на вписването в журнала за сума {0}",
 Please do not create more than 500 items at a time,"Моля, не създавайте повече от 500 артикула наведнъж",
@@ -3997,6 +3990,7 @@
 Release date must be in the future,Дата на издаване трябва да бъде в бъдеще,
 Relieving Date must be greater than or equal to Date of Joining,Дата на освобождаване трябва да бъде по-голяма или равна на датата на присъединяване,
 Rename,Преименувай,
+Rename Not Allowed,Преименуването не е позволено,
 Repayment Method is mandatory for term loans,Методът на погасяване е задължителен за срочните заеми,
 Repayment Start Date is mandatory for term loans,Началната дата на погасяване е задължителна за срочните заеми,
 Report Item,Елемент на отчета,
@@ -4043,7 +4037,6 @@
 Select All,Избери всички,
 Select Difference Account,Изберете Различен акаунт,
 Select a Default Priority.,Изберете приоритет по подразбиране.,
-Select a Supplier from the Default Supplier List of the items below.,Изберете доставчик от списъка с доставчици по подразбиране на артикулите по-долу.,
 Select a company,Изберете фирма,
 Select finance book for the item {0} at row {1},Изберете книга за финансиране за елемента {0} на ред {1},
 Select only one Priority as Default.,Изберете само един приоритет по подразбиране.,
@@ -4247,7 +4240,6 @@
 Actual ,действителен,
 Add to cart,Добави в кошницата,
 Budget,бюджет,
-Chart Of Accounts Importer,Вносител на сметкоплан,
 Chart of Accounts,График на сметките,
 Customer database.,База данни на клиентите.,
 Days Since Last order,Дни след последната поръчка,
@@ -4546,7 +4538,6 @@
 Check Supplier Invoice Number Uniqueness,Провери за уникалност на фактура на доставчик,
 Make Payment via Journal Entry,Направи Плащане чрез вестник Влизане,
 Unlink Payment on Cancellation of Invoice,Прекратяване на връзката с плащане при анулиране на фактура,
-Unlink Advance Payment on Cancelation of Order,Прекратяване на авансовото плащане при анулиране на поръчката,
 Book Asset Depreciation Entry Automatically,Автоматично отписване на амортизацията на активи,
 Automatically Add Taxes and Charges from Item Tax Template,Автоматично добавяне на данъци и такси от шаблона за данък върху стоки,
 Automatically Fetch Payment Terms,Автоматично извличане на условията за плащане,
@@ -4940,7 +4931,6 @@
 POS Customer Group,POS Customer Group,
 POS Field,ПОС поле,
 POS Item Group,POS Позиция Group,
-[Select],[Избор],
 Company Address,Адрес на компанията,
 Update Stock,Актуализация Наличности,
 Ignore Pricing Rule,Игнориране на правилата за ценообразуване,
@@ -6481,7 +6471,6 @@
 Appraisal Template,Оценка Template,
 For Employee Name,За Име на служител,
 Goals,Цели,
-Calculate Total Score,Изчисли Общ резултат,
 Total Score (Out of 5),Общ резултат (от 5),
 "Any other remarks, noteworthy effort that should go in the records.","Всякакви други забележки, отбелязване на усилието, които трябва да отиде в регистрите.",
 Appraisal Goal,Оценка Goal,
@@ -6599,11 +6588,6 @@
 Reason for Leaving,Причина за напускане,
 Leave Encashed?,Отсъствието е платено?,
 Encashment Date,Инкасо Дата,
-Exit Interview Details,Exit Интервю - Детайли,
-Held On,Проведена На,
-Reason for Resignation,Причина за Оставка,
-Better Prospects,По-добри перспективи,
-Health Concerns,Здравни проблеми,
 New Workplace,Ново работно място,
 HR-EAD-.YYYY.-,HR-ЕАД-.YYYY.-,
 Returned Amount,Върната сума,
@@ -8239,9 +8223,6 @@
 Manufacturers used in Items,Използвани производители в артикули,
 Limited to 12 characters,Ограничено до 12 символа,
 MAT-MR-.YYYY.-,МАТ-MR-.YYYY.-,
-Set Warehouse,Комплект Склад,
-Sets 'For Warehouse' in each row of the Items table.,Задава „За склад“ във всеки ред от таблицата „Предмети“.,
-Requested For,Поискана за,
 Partially Ordered,Частично подредени,
 Transferred,Прехвърлен,
 % Ordered,% Поръчани,
@@ -8690,8 +8671,6 @@
 Select warehouse for material requests,Изберете склад за заявки за материали,
 Transfer Materials For Warehouse {0},Прехвърляне на материали за склад {0},
 Production Plan Material Request Warehouse,Склад за искане на материал за производствен план,
-Set From Warehouse,Комплект от склад,
-Source Warehouse (Material Transfer),Склад на източника (прехвърляне на материали),
 Sets 'Source Warehouse' in each row of the items table.,Задава „Склад на източника“ във всеки ред от таблицата с артикули.,
 Sets 'Target Warehouse' in each row of the items table.,Задава „Target Warehouse“ във всеки ред от таблицата с елементи.,
 Show Cancelled Entries,Показване на отменени записи,
@@ -9157,7 +9136,6 @@
 Is Income Tax Component,Е компонент на данъка върху дохода,
 Component properties and references ,Свойства на компонентите и препратки,
 Additional Salary ,Допълнителна заплата,
-Condtion and formula,Състояние и формула,
 Unmarked days,Немаркирани дни,
 Absent Days,Отсъстващи дни,
 Conditions and Formula variable and example,Условия и формула променлива и пример,
@@ -9444,7 +9422,6 @@
 Please check your Plaid client ID and secret values,"Моля, проверете идентификационния номер на клиента си и тайните стойности",
 Bank transaction creation error,Грешка при създаване на банкова транзакция,
 Unit of Measurement,Мерна единица,
-Row #{}: Selling rate for item {} is lower than its {}. Selling rate should be atleast {},Ред № {}: Процентът на продажба на артикул {} е по-нисък от своя {}. Курсът на продажба трябва да бъде поне {},
 Fiscal Year {0} Does Not Exist,Фискална година {0} не съществува,
 Row # {0}: Returned Item {1} does not exist in {2} {3},Ред № {0}: Върнат артикул {1} не съществува в {2} {3},
 Valuation type charges can not be marked as Inclusive,Таксите от типа оценка не могат да бъдат маркирани като Включително,
@@ -9598,8 +9575,60 @@
 Response Time for {0} priority in row {1} can't be greater than Resolution Time.,Времето за реакция за {0} приоритет в ред {1} не може да бъде по-голямо от времето за резолюция.,
 {0} is not enabled in {1},{0} не е активиран в {1},
 Group by Material Request,Групиране по заявка за материал,
-"Row {0}: For Supplier {0}, Email Address is Required to Send Email",Ред {0}: За доставчика {0} е необходим имейл адрес за изпращане на имейл,
 Email Sent to Supplier {0},Изпратено имейл до доставчика {0},
 "The Access to Request for Quotation From Portal is Disabled. To Allow Access, Enable it in Portal Settings.","Достъпът до заявка за оферта от портала е деактивиран. За да разрешите достъп, разрешете го в настройките на портала.",
 Supplier Quotation {0} Created,Оферта на доставчика {0} Създадена,
 Valid till Date cannot be before Transaction Date,Валидно до Дата не може да бъде преди Датата на транзакцията,
+Unlink Advance Payment on Cancellation of Order,Прекратете връзката с авансово плащане при анулиране на поръчка,
+"Simple Python Expression, Example: territory != 'All Territories'","Прост израз на Python, Пример: территория! = &#39;Всички територии&#39;",
+Sales Contributions and Incentives,Вноски и стимули за продажби,
+Sourced by Supplier,Източник от доставчика,
+Total weightage assigned should be 100%.<br>It is {0},Общото определено претегляне трябва да бъде 100%.<br> Това е {0},
+Account {0} exists in parent company {1}.,Профилът {0} съществува в компанията майка {1}.,
+"To overrule this, enable '{0}' in company {1}","За да отмените това, активирайте „{0}“ във фирма {1}",
+Invalid condition expression,Невалиден израз на условие,
+Please Select a Company First,"Моля, първо изберете компания",
+Please Select Both Company and Party Type First,"Моля, първо изберете както фирма, така и тип страна",
+Provide the invoice portion in percent,Предоставете частта от фактурата в проценти,
+Give number of days according to prior selection,Посочете броя дни според предварителния подбор,
+Email Details,Подробности за имейл,
+"Select a greeting for the receiver. E.g. Mr., Ms., etc.","Изберете поздрав за приемника. Например г-н, г-жа и т.н.",
+Preview Email,Визуализация на имейл,
+Please select a Supplier,"Моля, изберете доставчик",
+Supplier Lead Time (days),Време за доставка на доставчика (дни),
+"Home, Work, etc.","Дом, работа и др.",
+Exit Interview Held On,Интервюто за изход се проведе,
+Condition and formula,Състояние и формула,
+Sets 'Target Warehouse' in each row of the Items table.,Задава „Целеви склад“ във всеки ред от таблицата „Елементи“.,
+Sets 'Source Warehouse' in each row of the Items table.,Задава „Склад на източника“ във всеки ред от таблицата „Елементи“.,
+POS Register,POS регистър,
+"Can not filter based on POS Profile, if grouped by POS Profile","Не може да се филтрира въз основа на POS профил, ако е групиран по POS профил",
+"Can not filter based on Customer, if grouped by Customer","Не може да се филтрира въз основа на Клиент, ако е групиран от Клиент",
+"Can not filter based on Cashier, if grouped by Cashier","Не може да се филтрира въз основа на Каса, ако е групирана по Каса",
+Payment Method,Начин на плащане,
+"Can not filter based on Payment Method, if grouped by Payment Method","Не може да се филтрира въз основа на начин на плащане, ако е групиран по начин на плащане",
+Supplier Quotation Comparison,Сравнение на офертите на доставчика,
+Price per Unit (Stock UOM),Цена за единица (запас UOM),
+Group by Supplier,Групиране по доставчик,
+Group by Item,Групиране по артикул,
+Remember to set {field_label}. It is required by {regulation}.,Не забравяйте да зададете {field_label}. Изисква се от {регламент}.,
+Enrollment Date cannot be before the Start Date of the Academic Year {0},Датата на записване не може да бъде преди началната дата на учебната година {0},
+Enrollment Date cannot be after the End Date of the Academic Term {0},Датата на записване не може да бъде след Крайната дата на академичния срок {0},
+Enrollment Date cannot be before the Start Date of the Academic Term {0},Дата на записване не може да бъде преди началната дата на академичния срок {0},
+Posting future transactions are not allowed due to Immutable Ledger,Публикуването на бъдещи транзакции не е разрешено поради неизменяема книга,
+Future Posting Not Allowed,Публикуването в бъдеще не е разрешено,
+"To enable Capital Work in Progress Accounting, ","За да активирате счетоводното отчитане на текущата работа,",
+you must select Capital Work in Progress Account in accounts table,трябва да изберете Сметка за текущ капитал в таблицата на сметките,
+You can also set default CWIP account in Company {},Можете също да зададете CWIP акаунт по подразбиране във Фирма {},
+The Request for Quotation can be accessed by clicking on the following button,"Заявката за оферта може да бъде достъпна, като кликнете върху следния бутон",
+Regards,за разбирането,
+Please click on the following button to set your new password,"Моля, кликнете върху следния бутон, за да зададете новата си парола",
+Update Password,Актуализиране на паролата,
+Row #{}: Selling rate for item {} is lower than its {}. Selling {} should be atleast {},Ред № {}: Процентът на продажба на артикул {} е по-нисък от своя {}. Продажбата {} трябва да бъде поне {},
+You can alternatively disable selling price validation in {} to bypass this validation.,"Можете алтернативно да деактивирате проверката на продажните цени в {}, за да заобиколите тази проверка.",
+Invalid Selling Price,Невалидна продажна цена,
+Address needs to be linked to a Company. Please add a row for Company in the Links table.,"Адресът трябва да бъде свързан с компания. Моля, добавете ред за компания в таблицата с връзки.",
+Company Not Linked,Фирма не е свързана,
+Import Chart of Accounts from CSV / Excel files,Импортиране на сметката от CSV / Excel файлове,
+Completed Qty cannot be greater than 'Qty to Manufacture',Попълненото количество не може да бъде по-голямо от „Количество за производство“,
+"Row {0}: For Supplier {1}, Email Address is Required to send an email",Ред {0}: За доставчика {1} е необходим имейл адрес за изпращане на имейл,
diff --git a/erpnext/translations/bn.csv b/erpnext/translations/bn.csv
index 349df65..7175546 100644
--- a/erpnext/translations/bn.csv
+++ b/erpnext/translations/bn.csv
@@ -521,7 +521,6 @@
 Chargeble,Chargeble,
 Charges are updated in Purchase Receipt against each item,চার্জ প্রতিটি আইটেমের বিরুদ্ধে কেনার রসিদ মধ্যে আপডেট করা হয়,
 "Charges will be distributed proportionately based on item qty or amount, as per your selection","চার্জ আনুপাতিক আপনার নির্বাচন অনুযায়ী, আইটেম Qty বা পরিমাণ উপর ভিত্তি করে বিতরণ করা হবে",
-Chart Of Accounts,হিসাবরক্ষনের তালিকা,
 Chart of Cost Centers,খরচ কেন্দ্র এর চার্ট,
 Check all,সবগুলু যাচাই করুন,
 Checkout,চেকআউট,
@@ -581,7 +580,6 @@
 Compensatory Off,পূরক অফ,
 Compensatory leave request days not in valid holidays,বাধ্যতামূলক ছুটি অনুরোধ দিন বৈধ ছুটির দিন না,
 Complaint,অভিযোগ,
-Completed Qty can not be greater than 'Qty to Manufacture',চেয়ে &#39;স্টক প্রস্তুত করতে&#39; সম্পন্ন Qty বৃহত্তর হতে পারে না,
 Completion Date,সমাপ্তির তারিখ,
 Computer,কম্পিউটার,
 Condition,শর্ত,
@@ -2033,7 +2031,6 @@
 Please select Charge Type first,প্রথম অভিযোগ টাইপ নির্বাচন করুন,
 Please select Company,কোম্পানি নির্বাচন করুন,
 Please select Company and Designation,দয়া করে কোম্পানি এবং মনোনীত নির্বাচন করুন,
-Please select Company and Party Type first,প্রথম কোম্পানি ও অনুষ্ঠান প্রকার নির্বাচন করুন,
 Please select Company and Posting Date to getting entries,অনুগ্রহ করে এন্ট্রি পাওয়ার জন্য কোম্পানি এবং পোস্টিং তারিখ নির্বাচন করুন,
 Please select Company first,প্রথম কোম্পানি নির্বাচন করুন,
 Please select Completion Date for Completed Asset Maintenance Log,সম্পুর্ণ সম্পত্তির রক্ষণাবেক্ষণ লগের জন্য সমাপ্তির তারিখ নির্বাচন করুন,
@@ -2980,7 +2977,6 @@
 The name of your company for which you are setting up this system.,"আপনার কোম্পানির নাম, যার জন্য আপনি এই সিস্টেম সেট আপ করা হয়.",
 The number of shares and the share numbers are inconsistent,শেয়ার সংখ্যা এবং শেয়ার নম্বর অসম্পূর্ণ,
 The payment gateway account in plan {0} is different from the payment gateway account in this payment request,এই পেমেন্ট অনুরোধে পেমেন্ট গেটওয়ে অ্যাকাউন্ট থেকে প্ল্যান {0} পেমেন্ট গেটওয়ে অ্যাকাউন্টটি ভিন্ন,
-The request for quotation can be accessed by clicking on the following link,উদ্ধৃতি জন্য অনুরোধ নিম্নলিখিত লিঙ্কে ক্লিক করে প্রবেশ করা যেতে পারে,
 The selected BOMs are not for the same item,নির্বাচিত BOMs একই আইটেমের জন্য নয়,
 The selected item cannot have Batch,নির্বাচিত আইটেমের ব্যাচ থাকতে পারে না,
 The seller and the buyer cannot be the same,বিক্রেতা এবং ক্রেতা একই হতে পারে না,
@@ -3130,7 +3126,6 @@
 Total flexible benefit component amount {0} should not be less than max benefits {1},মোট নমনীয় সুবিধা উপাদান পরিমাণ {0} সর্বোচ্চ সুবিধাগুলির চেয়ে কম হওয়া উচিত নয় {1},
 Total hours: {0},মোট ঘন্টা: {0},
 Total leaves allocated is mandatory for Leave Type {0},বন্টন প্রকারের {0} জন্য বরাদ্দকৃত মোট পাতার বাধ্যতামূলক,
-Total weightage assigned should be 100%. It is {0},100% হওয়া উচিত নির্ধারিত মোট গুরুত্ব. এটা হল {0},
 Total working hours should not be greater than max working hours {0},মোট কাজ ঘন্টা সর্বোচ্চ কর্মঘন্টা চেয়ে বেশী করা উচিত হবে না {0},
 Total {0} ({1}),মোট {0} ({1}),
 "Total {0} for all items is zero, may be you should change 'Distribute Charges Based On'","মোট {0} সব আইটেম জন্য শূন্য, আপনি &#39;উপর ভিত্তি করে চার্জ বিতরণ&#39; পরিবর্তন করা উচিত হতে পারে",
@@ -3544,7 +3539,6 @@
 Company field is required,কোম্পানির ক্ষেত্র প্রয়োজন,
 Creating Dimensions...,মাত্রা তৈরি করা হচ্ছে ...,
 Duplicate entry against the item code {0} and manufacturer {1},আইটেম কোড {0} এবং প্রস্তুতকারকের {1 against এর বিপরীতে সদৃশ প্রবেশ,
-Import Chart Of Accounts from CSV / Excel files,সিএসভি / এক্সেল ফাইলগুলি থেকে অ্যাকাউন্টগুলির চার্ট আমদানি করুন,
 Invalid GSTIN! The input you've entered doesn't match the GSTIN format for UIN Holders or Non-Resident OIDAR Service Providers,অবৈধ জিএসটিআইএন! আপনি যে ইনপুটটি প্রবেশ করেছেন তা ইউআইএন হোল্ডার বা অনাবাসিক OIDAR পরিষেবা সরবরাহকারীদের জন্য জিএসটিআইএন ফর্ম্যাটের সাথে মেলে না,
 Invoice Grand Total,চালান গ্র্যান্ড টোটাল,
 Last carbon check date cannot be a future date,শেষ কার্বন চেকের তারিখ কোনও ভবিষ্যতের তারিখ হতে পারে না,
@@ -3921,7 +3915,6 @@
 Plaid public token error,প্লেড পাবলিক টোকেন ত্রুটি,
 Plaid transactions sync error,প্লেড লেনদেনের সিঙ্ক ত্রুটি,
 Please check the error log for details about the import errors,আমদানি ত্রুটি সম্পর্কে বিশদ জন্য ত্রুটি লগ চেক করুন,
-Please click on the following link to set your new password,আপনার নতুন পাসওয়ার্ড সেট করতে নিচের লিঙ্কে ক্লিক করুন,
 Please create <b>DATEV Settings</b> for Company <b>{}</b>.,দয়া করে কোম্পানির জন্য <b>DATEV সেটিংস</b> তৈরি করুন <b>}}</b>,
 Please create adjustment Journal Entry for amount {0} ,দয়া করে} 0 amount পরিমাণের জন্য সামঞ্জস্য জার্নাল এন্ট্রি তৈরি করুন,
 Please do not create more than 500 items at a time,দয়া করে একবারে 500 টিরও বেশি আইটেম তৈরি করবেন না,
@@ -3997,6 +3990,7 @@
 Release date must be in the future,প্রকাশের তারিখ অবশ্যই ভবিষ্যতে হবে,
 Relieving Date must be greater than or equal to Date of Joining,মুক্তির তারিখ অবশ্যই যোগদানের তারিখের চেয়ে বড় বা সমান হতে হবে,
 Rename,পুনঃনামকরণ,
+Rename Not Allowed,পুনঃনামকরণ অনুমোদিত নয়,
 Repayment Method is mandatory for term loans,মেয়াদী loansণের জন্য পরিশোধের পদ্ধতি বাধ্যতামূলক,
 Repayment Start Date is mandatory for term loans,মেয়াদী loansণের জন্য পরিশোধ পরিশোধের তারিখ বাধ্যতামূলক,
 Report Item,আইটেম প্রতিবেদন করুন,
@@ -4043,7 +4037,6 @@
 Select All,সবগুলো নির্বাচন করা,
 Select Difference Account,ডিফারেন্স অ্যাকাউন্ট নির্বাচন করুন,
 Select a Default Priority.,একটি ডিফল্ট অগ্রাধিকার নির্বাচন করুন।,
-Select a Supplier from the Default Supplier List of the items below.,নীচের আইটেমগুলির ডিফল্ট সরবরাহকারী তালিকা থেকে একটি সরবরাহকারী নির্বাচন করুন।,
 Select a company,একটি সংস্থা নির্বাচন করুন,
 Select finance book for the item {0} at row {1},সারি for 1} আইটেমের জন্য book 0 finance জন্য অর্থ বই নির্বাচন করুন,
 Select only one Priority as Default.,ডিফল্ট হিসাবে কেবলমাত্র একটি অগ্রাধিকার নির্বাচন করুন।,
@@ -4247,7 +4240,6 @@
 Actual ,আসল,
 Add to cart,কার্ট যোগ করুন,
 Budget,বাজেট,
-Chart Of Accounts Importer,অ্যাকাউন্ট আমদানিকারক চার্ট,
 Chart of Accounts,হিসাবরক্ষনের তালিকা,
 Customer database.,গ্রাহক ডাটাবেস।,
 Days Since Last order,শেষ আদেশের দিনগুলি,
@@ -4546,7 +4538,6 @@
 Check Supplier Invoice Number Uniqueness,চেক সরবরাহকারী চালান নম্বর স্বতন্ত্রতা,
 Make Payment via Journal Entry,জার্নাল এন্ট্রি মাধ্যমে টাকা প্রাপ্তির,
 Unlink Payment on Cancellation of Invoice,চালান বাতিলের পেমেন্ট লিঙ্কমুক্ত,
-Unlink Advance Payment on Cancelation of Order,অর্ডার বাতিলকরণে অগ্রিম প্রদানের লিঙ্কমুক্ত করুন,
 Book Asset Depreciation Entry Automatically,বইয়ের অ্যাসেট অবচয় এণ্ট্রি স্বয়ংক্রিয়ভাবে,
 Automatically Add Taxes and Charges from Item Tax Template,আইটেম ট্যাক্স টেম্পলেট থেকে স্বয়ংক্রিয়ভাবে কর এবং চার্জ যুক্ত করুন,
 Automatically Fetch Payment Terms,স্বয়ংক্রিয়ভাবে প্রদানের শর্তাদি আনুন,
@@ -4940,7 +4931,6 @@
 POS Customer Group,পিওএস গ্রাহক গ্রুপ,
 POS Field,পস ফিল্ড,
 POS Item Group,পিওএস আইটেম গ্রুপ,
-[Select],[নির্বাচন],
 Company Address,প্রতিস্থান এর ঠিকানা,
 Update Stock,আপডেট শেয়ার,
 Ignore Pricing Rule,প্রাইসিং বিধি উপেক্ষা,
@@ -6481,7 +6471,6 @@
 Appraisal Template,মূল্যায়ন টেমপ্লেট,
 For Employee Name,কর্মচারীর নাম জন্য,
 Goals,গোল,
-Calculate Total Score,মোট স্কোর গণনা করা,
 Total Score (Out of 5),(5 এর মধ্যে) মোট স্কোর,
 "Any other remarks, noteworthy effort that should go in the records.","অন্য কোন মন্তব্য, রেকর্ড মধ্যে যেতে হবে যে উল্লেখযোগ্য প্রচেষ্টা.",
 Appraisal Goal,মূল্যায়ন গোল,
@@ -6599,11 +6588,6 @@
 Reason for Leaving,ত্যাগ করার জন্য কারণ,
 Leave Encashed?,Encashed ত্যাগ করবেন?,
 Encashment Date,নগদীকরণ তারিখ,
-Exit Interview Details,প্রস্থান ইন্টারভিউ এর বর্ণনা,
-Held On,অনুষ্ঠিত,
-Reason for Resignation,পদত্যাগ করার কারণ,
-Better Prospects,ভাল সম্ভাবনা,
-Health Concerns,স্বাস্থ সচেতন,
 New Workplace,নতুন কর্মক্ষেত্রে,
 HR-EAD-.YYYY.-,এইচআর-EAD-.YYYY.-,
 Returned Amount,ফেরত পরিমাণ,
@@ -8239,9 +8223,6 @@
 Manufacturers used in Items,চলছে ব্যবহৃত উৎপাদনকারী,
 Limited to 12 characters,12 অক্ষরের মধ্যে সীমাবদ্ধ,
 MAT-MR-.YYYY.-,Mat-এম আর-.YYYY.-,
-Set Warehouse,গুদাম সেট করুন,
-Sets 'For Warehouse' in each row of the Items table.,আইটেম টেবিলের প্রতিটি সারিতে &#39;গুদামের জন্য&#39; সেট করুন।,
-Requested For,জন্য অনুরোধ করা,
 Partially Ordered,আংশিক অর্ডার করা,
 Transferred,স্থানান্তরিত,
 % Ordered,% আদেশ,
@@ -8690,8 +8671,6 @@
 Select warehouse for material requests,উপাদান অনুরোধের জন্য গুদাম নির্বাচন করুন,
 Transfer Materials For Warehouse {0},গুদাম {0 For জন্য উপাদান স্থানান্তর,
 Production Plan Material Request Warehouse,উত্পাদন পরিকল্পনার সামগ্রী অনুরোধ গুদাম,
-Set From Warehouse,গুদাম থেকে সেট করুন,
-Source Warehouse (Material Transfer),উত্স গুদাম (উপাদান স্থানান্তর),
 Sets 'Source Warehouse' in each row of the items table.,আইটেম টেবিলের প্রতিটি সারিতে &#39;উত্স গুদাম&#39; সেট করুন।,
 Sets 'Target Warehouse' in each row of the items table.,আইটেম সারণির প্রতিটি সারিতে &#39;টার্গেট ওয়েয়ারহাউস&#39; সেট করুন।,
 Show Cancelled Entries,বাতিল এন্ট্রিগুলি দেখান,
@@ -9157,7 +9136,6 @@
 Is Income Tax Component,আয়কর অংশ,
 Component properties and references ,উপাদান বৈশিষ্ট্য এবং রেফারেন্স,
 Additional Salary ,অতিরিক্ত বেতন,
-Condtion and formula,শর্ত এবং সূত্র,
 Unmarked days,চিহ্নহীন দিনগুলি,
 Absent Days,অনুপস্থিত দিন,
 Conditions and Formula variable and example,শর্ত এবং সূত্র পরিবর্তনশীল এবং উদাহরণ,
@@ -9444,7 +9422,6 @@
 Please check your Plaid client ID and secret values,আপনার প্লাইড ক্লায়েন্ট আইডি এবং গোপন মান পরীক্ষা করুন,
 Bank transaction creation error,ব্যাংক লেনদেন তৈরির ত্রুটি,
 Unit of Measurement,পরিমাপের ইউনিট,
-Row #{}: Selling rate for item {} is lower than its {}. Selling rate should be atleast {},সারি # {}: আইটেম for for এর বিক্রয়ের হার তার {} এর চেয়ে কম} বিক্রয় হার কমপক্ষে হওয়া উচিত {},
 Fiscal Year {0} Does Not Exist,আর্থিক বছর {0} বিদ্যমান নেই,
 Row # {0}: Returned Item {1} does not exist in {2} {3},সারি # {0}: ফিরে আসা আইটেম {1 {{2} {3 in তে বিদ্যমান নেই,
 Valuation type charges can not be marked as Inclusive,মূল্য মূল্য ধরণের চার্জগুলি সমেত হিসাবে চিহ্নিত করা যায় না,
@@ -9598,8 +9575,60 @@
 Response Time for {0} priority in row {1} can't be greater than Resolution Time.,সারিতে} 1} অগ্রাধিকারের জন্য প্রতিক্রিয়া সময়টি olution 1} রেজোলিউশন সময়ের চেয়ে বেশি হতে পারে না।,
 {0} is not enabled in {1},{0} {1} এ সক্ষম নয়,
 Group by Material Request,উপাদান অনুরোধ দ্বারা গ্রুপ,
-"Row {0}: For Supplier {0}, Email Address is Required to Send Email",সারি {0}: সরবরাহকারী {0} এর জন্য ইমেল প্রেরণের জন্য ইমেল ঠিকানা প্রয়োজন,
 Email Sent to Supplier {0},সরবরাহকারীকে ইমেল প্রেরণ করা হয়েছে {0},
 "The Access to Request for Quotation From Portal is Disabled. To Allow Access, Enable it in Portal Settings.","পোর্টাল থেকে উদ্ধৃতি জন্য অনুরোধ অ্যাক্সেস অক্ষম করা হয়েছে। অ্যাক্সেসের অনুমতি দেওয়ার জন্য, এটি পোর্টাল সেটিংসে সক্ষম করুন।",
 Supplier Quotation {0} Created,সরবরাহকারী কোটেশন {0} তৈরি হয়েছে,
 Valid till Date cannot be before Transaction Date,তারিখ অবধি বৈধ লেনদেনের তারিখের আগে হতে পারে না,
+Unlink Advance Payment on Cancellation of Order,অর্ডার বাতিলকরণে অগ্রিম প্রদানের লিঙ্কমুক্ত করুন,
+"Simple Python Expression, Example: territory != 'All Territories'","সাধারণ পাইথন এক্সপ্রেশন, উদাহরণ: অঞ্চল! = &#39;সমস্ত অঞ্চল&#39;",
+Sales Contributions and Incentives,বিক্রয় অবদান এবং উত্সাহ,
+Sourced by Supplier,সরবরাহকারী দ্বারা উত্সাহিত,
+Total weightage assigned should be 100%.<br>It is {0},বরাদ্দকৃত মোট ওজন 100% হওয়া উচিত।<br> এটি {0},
+Account {0} exists in parent company {1}.,অ্যাকাউন্ট {0 parent মূল কোম্পানিতে} 1} বিদ্যমান},
+"To overrule this, enable '{0}' in company {1}","এটি উপেক্ষা করার জন্য, কোম্পানির &#39;1}&#39; {0} &#39;সক্ষম করুন",
+Invalid condition expression,অবৈধ শর্তের অভিব্যক্তি,
+Please Select a Company First,দয়া করে প্রথমে একটি সংস্থা নির্বাচন করুন,
+Please Select Both Company and Party Type First,দয়া করে প্রথম সংস্থা এবং পার্টি উভয়ই নির্বাচন করুন,
+Provide the invoice portion in percent,চালানের অংশ শতাংশে সরবরাহ করুন,
+Give number of days according to prior selection,পূর্ববর্তী নির্বাচন অনুযায়ী দিন সংখ্যা দিন,
+Email Details,ইমেল বিশদ,
+"Select a greeting for the receiver. E.g. Mr., Ms., etc.","গ্রহীতার জন্য একটি শুভেচ্ছা নির্বাচন করুন। যেমন মিঃ, মিসেস, ইত্যাদি",
+Preview Email,পূর্বরূপ ইমেল,
+Please select a Supplier,একটি সরবরাহকারী নির্বাচন করুন,
+Supplier Lead Time (days),সরবরাহকারী সীসা সময় (দিন),
+"Home, Work, etc.","বাড়ি, কাজ ইত্যাদি",
+Exit Interview Held On,সাক্ষাত্কারটি প্রস্থান করুন,
+Condition and formula,শর্ত এবং সূত্র,
+Sets 'Target Warehouse' in each row of the Items table.,আইটেম টেবিলের প্রতিটি সারিতে &#39;টার্গেট ওয়েয়ারহাউস&#39; সেট করুন।,
+Sets 'Source Warehouse' in each row of the Items table.,আইটেম টেবিলের প্রতিটি সারিতে &#39;উত্স গুদাম&#39; সেট করুন।,
+POS Register,পস রেজিস্টার,
+"Can not filter based on POS Profile, if grouped by POS Profile","POS প্রোফাইলের ভিত্তিতে ফিল্টার করা যায় না, যদি পস প্রোফাইল দ্বারা গোষ্ঠীভূত হয়",
+"Can not filter based on Customer, if grouped by Customer",গ্রাহক দ্বারা গ্রুপ করা থাকলে গ্রাহকের উপর ভিত্তি করে ফিল্টার করতে পারবেন না,
+"Can not filter based on Cashier, if grouped by Cashier","ক্যাশিয়ারের ভিত্তিতে, ক্যাশিয়ারের ভিত্তিতে ফিল্টার করা যায় না",
+Payment Method,মূল্যপরিশোধ পদ্ধতি,
+"Can not filter based on Payment Method, if grouped by Payment Method",অর্থ প্রদানের পদ্ধতি অনুসারে অর্থ প্রদানের পদ্ধতির ভিত্তিতে ফিল্টার করতে পারবেন না,
+Supplier Quotation Comparison,সরবরাহকারী কোটেশন তুলনা,
+Price per Unit (Stock UOM),ইউনিট প্রতি মূল্য (স্টক ইউওএম),
+Group by Supplier,সরবরাহকারী দ্বারা গ্রুপ,
+Group by Item,আইটেম দ্বারা গ্রুপ,
+Remember to set {field_label}. It is required by {regulation}.,{ক্ষেত্র_লাবেল set সেট করতে মনে রাখবেন} এটি {নিয়ন্ত্রণ by দ্বারা প্রয়োজনীয়},
+Enrollment Date cannot be before the Start Date of the Academic Year {0},তালিকাভুক্তির তারিখ একাডেমিক বছরের শুরুর তারিখের আগে হতে পারে না {0},
+Enrollment Date cannot be after the End Date of the Academic Term {0},তালিকাভুক্তির তারিখ একাডেমিক মেয়াদ শেষের তারিখের পরে হতে পারে না {0},
+Enrollment Date cannot be before the Start Date of the Academic Term {0},তালিকাভুক্তির তারিখ একাডেমিক টার্মের শুরুর তারিখের আগে হতে পারে না {0},
+Posting future transactions are not allowed due to Immutable Ledger,অপরিবর্তনীয় লেজারের কারণে ভবিষ্যতে লেনদেনগুলি অনুমোদিত নয়,
+Future Posting Not Allowed,ভবিষ্যতের পোস্টিং অনুমোদিত নয়,
+"To enable Capital Work in Progress Accounting, ","অগ্রগতি অ্যাকাউন্টিংয়ে মূলধন কাজ সক্ষম করতে,",
+you must select Capital Work in Progress Account in accounts table,আপনার অবশ্যই অ্যাকাউন্টের সারণীতে প্রগতি অ্যাকাউন্টে মূলধন কাজ নির্বাচন করতে হবে,
+You can also set default CWIP account in Company {},আপনি সংস্থা default default এ ডিফল্ট সিডব্লিউআইপি অ্যাকাউন্টও সেট করতে পারেন,
+The Request for Quotation can be accessed by clicking on the following button,অনুরোধের জন্য নিচের বোতামটি ক্লিক করে প্রবেশ করা যাবে,
+Regards,শ্রদ্ধা,
+Please click on the following button to set your new password,আপনার নতুন পাসওয়ার্ড সেট করতে দয়া করে নীচের বোতামটিতে ক্লিক করুন,
+Update Password,পাসওয়ার্ড আপডেট করুন,
+Row #{}: Selling rate for item {} is lower than its {}. Selling {} should be atleast {},সারি # {}: আইটেম for for এর বিক্রয়ের হার তার {{এর চেয়ে কম} {Lling বিক্রয় কমপক্ষে হওয়া উচিত {},
+You can alternatively disable selling price validation in {} to bypass this validation.,আপনি এই বৈধতাটিকে বাইপাস করতে বিকল্প মূল্য valid in এ বিক্রয় বৈধতা অক্ষম করতে পারেন।,
+Invalid Selling Price,অবৈধ বিক্রয় মূল্য,
+Address needs to be linked to a Company. Please add a row for Company in the Links table.,ঠিকানা কোনও সংস্থার সাথে সংযুক্ত করা দরকার। লিংক সারণীতে সংস্থার জন্য একটি সারি যুক্ত করুন।,
+Company Not Linked,সংযুক্ত নয় সংস্থা,
+Import Chart of Accounts from CSV / Excel files,সিএসভি / এক্সেল ফাইলগুলি থেকে অ্যাকাউন্টগুলির চার্ট আমদানি করুন,
+Completed Qty cannot be greater than 'Qty to Manufacture',সম্পূর্ণ পরিমাণটি &#39;কোটির থেকে উত্পাদন&#39; এর চেয়ে বড় হতে পারে না,
+"Row {0}: For Supplier {1}, Email Address is Required to send an email",সারি {0}: সরবরাহকারী {1} এর জন্য ইমেল প্রেরণের জন্য ইমেল ঠিকানা প্রয়োজন,
diff --git a/erpnext/translations/bs.csv b/erpnext/translations/bs.csv
index 7fee0ab..7da03c3 100644
--- a/erpnext/translations/bs.csv
+++ b/erpnext/translations/bs.csv
@@ -521,7 +521,6 @@
 Chargeble,Chargeble,
 Charges are updated in Purchase Receipt against each item,Naknade se ažuriraju u Kupovina Prijem protiv svaku stavku,
 "Charges will be distributed proportionately based on item qty or amount, as per your selection","Naknade će se distribuirati proporcionalno na osnovu stavka količina ili iznos, po svom izboru",
-Chart Of Accounts,Šifarnik konta,
 Chart of Cost Centers,Grafikon troškovnih centara,
 Check all,Provjerite sve,
 Checkout,Provjeri,
@@ -581,7 +580,6 @@
 Compensatory Off,kompenzacijski Off,
 Compensatory leave request days not in valid holidays,Dane zahtjeva za kompenzacijski odmor ne važe u valjanim praznicima,
 Complaint,Žalba,
-Completed Qty can not be greater than 'Qty to Manufacture',Završene Qty ne može biti veća od 'Količina za proizvodnju',
 Completion Date,Završetak Datum,
 Computer,Računar,
 Condition,Stanje,
@@ -2033,7 +2031,6 @@
 Please select Charge Type first,Odaberite Naknada za prvi,
 Please select Company,Molimo odaberite Company,
 Please select Company and Designation,Izaberite kompaniju i oznaku,
-Please select Company and Party Type first,Molimo najprije odaberite Društva i Party Tip,
 Please select Company and Posting Date to getting entries,Molimo da odaberete Kompaniju i Datum objavljivanja da biste dobili unose,
 Please select Company first,Molimo najprije odaberite Company,
 Please select Completion Date for Completed Asset Maintenance Log,Molimo izaberite Datum završetka za popunjeni dnevnik održavanja sredstava,
@@ -2980,7 +2977,6 @@
 The name of your company for which you are setting up this system.,Ime vaše tvrtke za koje ste postavljanje ovog sustava .,
 The number of shares and the share numbers are inconsistent,Broj akcija i brojevi učešća su nedosljedni,
 The payment gateway account in plan {0} is different from the payment gateway account in this payment request,Račun plaćačkog plaćanja u planu {0} razlikuje se od naloga za plaćanje u ovom zahtjevu za plaćanje,
-The request for quotation can be accessed by clicking on the following link,Zahtjev za ponudu se može pristupiti klikom na sljedeći link,
 The selected BOMs are not for the same item,Izabrani sastavnica nisu za isti predmet,
 The selected item cannot have Batch,Izabrana stavka ne može imati Batch,
 The seller and the buyer cannot be the same,Prodavac i kupac ne mogu biti isti,
@@ -3130,7 +3126,6 @@
 Total flexible benefit component amount {0} should not be less than max benefits {1},Ukupni iznos komponente fleksibilne naknade {0} ne smije biti manji od maksimuma {1},
 Total hours: {0},Ukupan broj sati: {0},
 Total leaves allocated is mandatory for Leave Type {0},Ukupna izdvojena listića su obavezna za Tip Leave {0},
-Total weightage assigned should be 100%. It is {0},Ukupno bi trebalo biti dodijeljena weightage 100 % . To je {0},
 Total working hours should not be greater than max working hours {0},Ukupno radnog vremena ne smije biti veća od max radnog vremena {0},
 Total {0} ({1}),Ukupno {0} ({1}),
 "Total {0} for all items is zero, may be you should change 'Distribute Charges Based On'","Ukupno {0} za sve stavke je nula, možda biste trebali promijeniti &#39;Rasporedite Optužbe na osnovu&#39;",
@@ -3544,7 +3539,6 @@
 Company field is required,Polje kompanije je obavezno,
 Creating Dimensions...,Stvaranje dimenzija ...,
 Duplicate entry against the item code {0} and manufacturer {1},Duplikat unosa sa šifrom artikla {0} i proizvođačem {1},
-Import Chart Of Accounts from CSV / Excel files,Uvoz računa sa CSV / Excel datoteka,
 Invalid GSTIN! The input you've entered doesn't match the GSTIN format for UIN Holders or Non-Resident OIDAR Service Providers,Nevažeći GSTIN! Uneseni unos ne odgovara formatu GSTIN za vlasnike UIN-a ili nerezidentne dobavljače usluga OIDAR,
 Invoice Grand Total,Faktura Grand Total,
 Last carbon check date cannot be a future date,Posljednji datum provjere ugljika ne može biti budući datum,
@@ -3921,7 +3915,6 @@
 Plaid public token error,Greška u javnom tokenu,
 Plaid transactions sync error,Greška sinhronizacije transakcija u plaidu,
 Please check the error log for details about the import errors,Molimo provjerite dnevnik grešaka za detalje o uvoznim greškama,
-Please click on the following link to set your new password,Molimo kliknite na sljedeći link i postaviti novu lozinku,
 Please create <b>DATEV Settings</b> for Company <b>{}</b>.,Molimo kreirajte <b>DATEV postavke</b> za kompaniju <b>{}</b> .,
 Please create adjustment Journal Entry for amount {0} ,Molimo izradite podešavanje unosa u časopisu za iznos {0},
 Please do not create more than 500 items at a time,Molimo ne stvarajte više od 500 predmeta odjednom,
@@ -3997,6 +3990,7 @@
 Release date must be in the future,Datum izlaska mora biti u budućnosti,
 Relieving Date must be greater than or equal to Date of Joining,Datum oslobađanja mora biti veći ili jednak datumu pridruživanja,
 Rename,preimenovati,
+Rename Not Allowed,Preimenovanje nije dozvoljeno,
 Repayment Method is mandatory for term loans,Način otplate je obavezan za oročene kredite,
 Repayment Start Date is mandatory for term loans,Datum početka otplate je obavezan za oročene kredite,
 Report Item,Izvještaj,
@@ -4043,7 +4037,6 @@
 Select All,Odaberite sve,
 Select Difference Account,Odaberite račun razlike,
 Select a Default Priority.,Odaberite zadani prioritet.,
-Select a Supplier from the Default Supplier List of the items below.,Izaberite dobavljača sa zadanog popisa dobavljača donjih stavki.,
 Select a company,Odaberite kompaniju,
 Select finance book for the item {0} at row {1},Odaberite knjigu finansiranja za stavku {0} u retku {1},
 Select only one Priority as Default.,Odaberite samo jedan prioritet kao podrazumevani.,
@@ -4247,7 +4240,6 @@
 Actual ,Stvaran,
 Add to cart,Dodaj u košaricu,
 Budget,Budžet,
-Chart Of Accounts Importer,Uvoznik kontnog plana,
 Chart of Accounts,Chart of Accounts,
 Customer database.,Baza podataka klijenata.,
 Days Since Last order,Dana od posljednje narudžbe,
@@ -4546,7 +4538,6 @@
 Check Supplier Invoice Number Uniqueness,Check Dobavljač Faktura Broj Jedinstvenost,
 Make Payment via Journal Entry,Izvršiti uplatu preko Journal Entry,
 Unlink Payment on Cancellation of Invoice,Odvajanje Plaćanje o otkazivanju fakture,
-Unlink Advance Payment on Cancelation of Order,Prekidajte avansno plaćanje otkaza narudžbe,
 Book Asset Depreciation Entry Automatically,Knjiga imovine Amortizacija Entry Automatski,
 Automatically Add Taxes and Charges from Item Tax Template,Automatski dodajte poreze i pristojbe sa predloška poreza na stavke,
 Automatically Fetch Payment Terms,Automatski preuzmi Uvjete plaćanja,
@@ -4940,7 +4931,6 @@
 POS Customer Group,POS kupaca Grupa,
 POS Field,POS polje,
 POS Item Group,POS Stavka Group,
-[Select],[ izaberite ],
 Company Address,Company Adresa,
 Update Stock,Ažurirajte Stock,
 Ignore Pricing Rule,Ignorirajte Cijene pravilo,
@@ -6481,7 +6471,6 @@
 Appraisal Template,Procjena Predložak,
 For Employee Name,Za ime zaposlenika,
 Goals,Golovi,
-Calculate Total Score,Izračunaj ukupan rezultat,
 Total Score (Out of 5),Ukupna ocjena (od 5),
 "Any other remarks, noteworthy effort that should go in the records.","Bilo koji drugi primjedbe, napomenuti napor koji treba da ide u evidenciji.",
 Appraisal Goal,Procjena gol,
@@ -6599,11 +6588,6 @@
 Reason for Leaving,Razlog za odlazak,
 Leave Encashed?,Ostavite Encashed?,
 Encashment Date,Encashment Datum,
-Exit Interview Details,Izlaz Intervju Detalji,
-Held On,Održanoj,
-Reason for Resignation,Razlog za ostavku,
-Better Prospects,Bolji izgledi,
-Health Concerns,Zdravlje Zabrinutost,
 New Workplace,Novi radnom mjestu,
 HR-EAD-.YYYY.-,HR-EAD-YYYY.-,
 Returned Amount,Iznos vraćenog iznosa,
@@ -8239,9 +8223,6 @@
 Manufacturers used in Items,Proizvođači se koriste u Predmeti,
 Limited to 12 characters,Ograničena na 12 znakova,
 MAT-MR-.YYYY.-,MAT-MR-.YYYY.-,
-Set Warehouse,Postavi skladište,
-Sets 'For Warehouse' in each row of the Items table.,Postavlja &#39;Za skladište&#39; u svaki red tabele Predmeti.,
-Requested For,Traženi Za,
 Partially Ordered,Djelomično naređeno,
 Transferred,prebačen,
 % Ordered,% Poruceno,
@@ -8690,8 +8671,6 @@
 Select warehouse for material requests,Odaberite skladište za zahtjeve za materijalom,
 Transfer Materials For Warehouse {0},Transfer materijala za skladište {0},
 Production Plan Material Request Warehouse,Skladište zahtjeva za planom proizvodnje,
-Set From Warehouse,Postavljeno iz skladišta,
-Source Warehouse (Material Transfer),Izvorno skladište (prijenos materijala),
 Sets 'Source Warehouse' in each row of the items table.,Postavlja &#39;Izvorno skladište&#39; u svaki red tablice stavki.,
 Sets 'Target Warehouse' in each row of the items table.,Postavlja &#39;Target Warehouse&#39; u svaki red tablice stavki.,
 Show Cancelled Entries,Prikaži otkazane unose,
@@ -9157,7 +9136,6 @@
 Is Income Tax Component,Je komponenta poreza na dohodak,
 Component properties and references ,Svojstva i reference komponenata,
 Additional Salary ,Dodatna plata,
-Condtion and formula,Stanje i formula,
 Unmarked days,Neoznačeni dani,
 Absent Days,Dani odsutnosti,
 Conditions and Formula variable and example,Uvjeti i varijabla formule i primjer,
@@ -9444,7 +9422,6 @@
 Please check your Plaid client ID and secret values,Molimo provjerite svoj ID klijenta i tajne vrijednosti,
 Bank transaction creation error,Greška u kreiranju bankovne transakcije,
 Unit of Measurement,Mjerna jedinica,
-Row #{}: Selling rate for item {} is lower than its {}. Selling rate should be atleast {},Red # {}: Stopa prodaje predmeta {} niža je od njegove {}. Stopa prodaje treba biti najmanje {},
 Fiscal Year {0} Does Not Exist,Fiskalna godina {0} ne postoji,
 Row # {0}: Returned Item {1} does not exist in {2} {3},Redak {0}: Vraćena stavka {1} ne postoji u {2} {3},
 Valuation type charges can not be marked as Inclusive,Naknade za vrstu vrednovanja ne mogu se označiti kao sveobuhvatne,
@@ -9598,8 +9575,60 @@
 Response Time for {0} priority in row {1} can't be greater than Resolution Time.,Vrijeme odziva za {0} prioritet u redu {1} ne može biti veće od vremena razlučivanja.,
 {0} is not enabled in {1},{0} nije omogućen u {1},
 Group by Material Request,Grupiraj prema zahtjevu za materijal,
-"Row {0}: For Supplier {0}, Email Address is Required to Send Email",Red {0}: Za dobavljača {0} za slanje e-pošte potrebna je adresa e-pošte,
 Email Sent to Supplier {0},E-pošta poslana dobavljaču {0},
 "The Access to Request for Quotation From Portal is Disabled. To Allow Access, Enable it in Portal Settings.","Pristup zahtjevu za ponudu sa portala je onemogućen. Da biste omogućili pristup, omogućite ga u postavkama portala.",
 Supplier Quotation {0} Created,Ponuda dobavljača {0} kreirana,
 Valid till Date cannot be before Transaction Date,Važi do datuma ne može biti prije datuma transakcije,
+Unlink Advance Payment on Cancellation of Order,Prekinite vezu s avansnim plaćanjem nakon otkazivanja narudžbe,
+"Simple Python Expression, Example: territory != 'All Territories'","Jednostavan Python izraz, primjer: teritorij! = &#39;Sve teritorije&#39;",
+Sales Contributions and Incentives,Doprinosi prodaji i podsticaji,
+Sourced by Supplier,Izvor dobavljača,
+Total weightage assigned should be 100%.<br>It is {0},Ukupna dodijeljena težina treba biti 100%.<br> {0} je,
+Account {0} exists in parent company {1}.,Račun {0} postoji u matičnoj kompaniji {1}.,
+"To overrule this, enable '{0}' in company {1}","Da biste ovo prevladali, omogućite &#39;{0}&#39; u kompaniji {1}",
+Invalid condition expression,Nevažeći izraz stanja,
+Please Select a Company First,Prvo odaberite kompaniju,
+Please Select Both Company and Party Type First,Molimo odaberite prvo vrstu kompanije i stranke,
+Provide the invoice portion in percent,Navedite dio fakture u procentima,
+Give number of days according to prior selection,Navedite broj dana prema prethodnom odabiru,
+Email Details,Detalji e-pošte,
+"Select a greeting for the receiver. E.g. Mr., Ms., etc.","Odaberite pozdrav za prijemnik. Npr. Gospodin, gospođa itd.",
+Preview Email,Pregled e-pošte,
+Please select a Supplier,Molimo odaberite dobavljača,
+Supplier Lead Time (days),Vrijeme isporuke dobavljača (dana),
+"Home, Work, etc.","Kuća, posao itd.",
+Exit Interview Held On,Izlazni intervju održan,
+Condition and formula,Stanje i formula,
+Sets 'Target Warehouse' in each row of the Items table.,Postavlja &#39;Ciljno skladište&#39; u svaki red tabele Predmeti.,
+Sets 'Source Warehouse' in each row of the Items table.,Postavlja &#39;Izvorno skladište&#39; u svaki red tabele Predmeti.,
+POS Register,POS registar,
+"Can not filter based on POS Profile, if grouped by POS Profile","Ne može se filtrirati na osnovu POS profila, ako je grupirano po POS profilu",
+"Can not filter based on Customer, if grouped by Customer","Ne može se filtrirati prema kupcu, ako ga grupiše kupac",
+"Can not filter based on Cashier, if grouped by Cashier","Ne može se filtrirati na osnovu blagajne, ako je grupirana po blagajni",
+Payment Method,Način plaćanja,
+"Can not filter based on Payment Method, if grouped by Payment Method","Ne može se filtrirati na osnovu načina plaćanja, ako je grupirano prema načinu plaćanja",
+Supplier Quotation Comparison,Usporedba ponuda dobavljača,
+Price per Unit (Stock UOM),Cijena po jedinici (zaliha UOM),
+Group by Supplier,Grupa prema dobavljaču,
+Group by Item,Grupiraj po stavkama,
+Remember to set {field_label}. It is required by {regulation}.,Ne zaboravite postaviti {field_label}. To zahtijeva {propis}.,
+Enrollment Date cannot be before the Start Date of the Academic Year {0},Datum upisa ne može biti pre datuma početka akademske godine {0},
+Enrollment Date cannot be after the End Date of the Academic Term {0},Datum upisa ne može biti nakon datuma završetka akademskog roka {0},
+Enrollment Date cannot be before the Start Date of the Academic Term {0},Datum upisa ne može biti pre datuma početka akademskog roka {0},
+Posting future transactions are not allowed due to Immutable Ledger,Knjiženje budućih transakcija nije dozvoljeno zbog Nepromjenjive knjige,
+Future Posting Not Allowed,Objavljivanje u budućnosti nije dozvoljeno,
+"To enable Capital Work in Progress Accounting, ","Da bi se omogućilo računovodstvo kapitalnog rada u toku,",
+you must select Capital Work in Progress Account in accounts table,u tablici računa morate odabrati Račun kapitalnog rada u toku,
+You can also set default CWIP account in Company {},Također možete postaviti zadani CWIP račun u kompaniji {},
+The Request for Quotation can be accessed by clicking on the following button,Zahtjevu za ponudu možete pristupiti klikom na sljedeće dugme,
+Regards,Pozdrav,
+Please click on the following button to set your new password,Kliknite na sljedeći gumb da biste postavili novu lozinku,
+Update Password,Ažuriraj lozinku,
+Row #{}: Selling rate for item {} is lower than its {}. Selling {} should be atleast {},Red # {}: Stopa prodaje predmeta {} niža je od njegove {}. Prodaja {} treba biti najmanje {},
+You can alternatively disable selling price validation in {} to bypass this validation.,Alternativno možete onemogućiti provjeru prodajne cijene u {} da biste zaobišli ovu provjeru.,
+Invalid Selling Price,Nevažeća prodajna cijena,
+Address needs to be linked to a Company. Please add a row for Company in the Links table.,Adresa mora biti povezana sa kompanijom. Dodajte red za kompaniju u tabelu veza.,
+Company Not Linked,Kompanija nije povezana,
+Import Chart of Accounts from CSV / Excel files,Uvezite kontni plan iz CSV / Excel datoteka,
+Completed Qty cannot be greater than 'Qty to Manufacture',Završena količina ne može biti veća od &#39;Količina za proizvodnju&#39;,
+"Row {0}: For Supplier {1}, Email Address is Required to send an email",Red {0}: Za dobavljača {1} za slanje e-pošte potrebna je adresa e-pošte,
diff --git a/erpnext/translations/ca.csv b/erpnext/translations/ca.csv
index cc36c6f..42ec729 100644
--- a/erpnext/translations/ca.csv
+++ b/erpnext/translations/ca.csv
@@ -521,7 +521,6 @@
 Chargeble,Càrrec,
 Charges are updated in Purchase Receipt against each item,Els càrrecs s'actualitzen amb els rebuts de compra contra cada un dels articles,
 "Charges will be distributed proportionately based on item qty or amount, as per your selection","Els càrrecs es distribuiran proporcionalment basen en Quantitat o import de l'article, segons la teva selecció",
-Chart Of Accounts,Pla General de Comptabilitat,
 Chart of Cost Centers,Gràfic de centres de cost,
 Check all,Marqueu totes les,
 Checkout,caixa,
@@ -581,7 +580,6 @@
 Compensatory Off,Compensatori,
 Compensatory leave request days not in valid holidays,Dates de sol · licitud de baixa compensatòria no en vacances vàlides,
 Complaint,Queixa,
-Completed Qty can not be greater than 'Qty to Manufacture',Completat Quantitat no pot ser major que 'Cant de Fabricació',
 Completion Date,Data d'acabament,
 Computer,Ordinador,
 Condition,Condició,
@@ -2033,7 +2031,6 @@
 Please select Charge Type first,Seleccioneu Tipus de Càrrec primer,
 Please select Company,Seleccioneu de l&#39;empresa,
 Please select Company and Designation,Seleccioneu Companyia i Designació,
-Please select Company and Party Type first,Seleccioneu de l'empresa i el Partit Tipus primer,
 Please select Company and Posting Date to getting entries,Seleccioneu Companyia i Data de publicació per obtenir entrades,
 Please select Company first,Si us plau seleccioneu l'empresa primer,
 Please select Completion Date for Completed Asset Maintenance Log,Seleccioneu Data de finalització del registre de manteniment d&#39;actius completat,
@@ -2980,7 +2977,6 @@
 The name of your company for which you are setting up this system.,El nom de la teva empresa per a la qual està creant aquest sistema.,
 The number of shares and the share numbers are inconsistent,El nombre d&#39;accions i els números d&#39;accions són incompatibles,
 The payment gateway account in plan {0} is different from the payment gateway account in this payment request,El compte de la passarel·la de pagament del pla {0} és diferent del compte de la passarel·la de pagament en aquesta sol·licitud de pagament,
-The request for quotation can be accessed by clicking on the following link,La sol·licitud de cotització es pot accedir fent clic al següent enllaç,
 The selected BOMs are not for the same item,Les llistes de materials seleccionats no són per al mateix article,
 The selected item cannot have Batch,L'element seleccionat no pot tenir per lots,
 The seller and the buyer cannot be the same,El venedor i el comprador no poden ser iguals,
@@ -3130,7 +3126,6 @@
 Total flexible benefit component amount {0} should not be less than max benefits {1},Import total del component de benefici flexible {0} no ha de ser inferior al màxim de beneficis {1},
 Total hours: {0},Total hores: {0},
 Total leaves allocated is mandatory for Leave Type {0},Les fulles totals assignades són obligatòries per al tipus Leave {0},
-Total weightage assigned should be 100%. It is {0},El pes total assignat ha de ser 100%. És {0},
 Total working hours should not be greater than max working hours {0},Total d&#39;hores de treball no han de ser més grans que les hores de treball max {0},
 Total {0} ({1}),Total {0} ({1}),
 "Total {0} for all items is zero, may be you should change 'Distribute Charges Based On'","Total d&#39;{0} per a tots els elements és zero, pot ser que vostè ha de canviar a &quot;Distribuir els càrrecs basats en &#39;",
@@ -3544,7 +3539,6 @@
 Company field is required,El camp de l&#39;empresa és obligatori,
 Creating Dimensions...,Creació de dimensions ...,
 Duplicate entry against the item code {0} and manufacturer {1},Duplicar l&#39;entrada amb el codi de l&#39;article {0} i el fabricant {1},
-Import Chart Of Accounts from CSV / Excel files,Importa el gràfic de comptes de fitxers CSV / Excel,
 Invalid GSTIN! The input you've entered doesn't match the GSTIN format for UIN Holders or Non-Resident OIDAR Service Providers,GSTIN no vàlid. L&#39;entrada que heu introduït no coincideix amb el format GSTIN per a titulars d&#39;UIN o proveïdors de serveis OIDAR no residents,
 Invoice Grand Total,Factura total total,
 Last carbon check date cannot be a future date,L&#39;última data de revisió del carboni no pot ser una data futura,
@@ -3921,7 +3915,6 @@
 Plaid public token error,Error de testimoni públic de l&#39;escriptura,
 Plaid transactions sync error,Error de sincronització de transaccions amb plaid,
 Please check the error log for details about the import errors,Consulteu el registre d’errors per obtenir més detalls sobre els errors d’importació,
-Please click on the following link to set your new password,"Si us plau, feu clic al següent enllaç per configurar la nova contrasenya",
 Please create <b>DATEV Settings</b> for Company <b>{}</b>.,<b>Creeu la configuració de DATEV</b> per a l&#39;empresa <b>{}</b> .,
 Please create adjustment Journal Entry for amount {0} ,Creeu l’entrada del diari d’ajust per l’import {0}.,
 Please do not create more than 500 items at a time,No creeu més de 500 articles alhora,
@@ -3997,6 +3990,7 @@
 Release date must be in the future,La data de llançament ha de ser en el futur,
 Relieving Date must be greater than or equal to Date of Joining,La data de alleujament ha de ser superior o igual a la data d&#39;adhesió,
 Rename,Canviar el nom,
+Rename Not Allowed,Canvia de nom no permès,
 Repayment Method is mandatory for term loans,El mètode de reemborsament és obligatori per a préstecs a termini,
 Repayment Start Date is mandatory for term loans,La data d’inici del reemborsament és obligatòria per als préstecs a termini,
 Report Item,Informe,
@@ -4043,7 +4037,6 @@
 Select All,Selecciona tot,
 Select Difference Account,Seleccioneu el compte de diferències,
 Select a Default Priority.,Seleccioneu una prioritat per defecte.,
-Select a Supplier from the Default Supplier List of the items below.,Seleccioneu un proveïdor de la llista de proveïdors predeterminada dels articles següents.,
 Select a company,Seleccioneu una empresa,
 Select finance book for the item {0} at row {1},Seleccioneu un llibre de finances per a l&#39;element {0} de la fila {1},
 Select only one Priority as Default.,Seleccioneu només una prioritat com a predeterminada.,
@@ -4247,7 +4240,6 @@
 Actual ,Reial,
 Add to cart,Afegir a la cistella,
 Budget,Pressupost,
-Chart Of Accounts Importer,Gràfic de l&#39;importador de comptes,
 Chart of Accounts,Taula de comptes,
 Customer database.,Base de dades de clients.,
 Days Since Last order,Dies des de la darrera comanda,
@@ -4546,7 +4538,6 @@
 Check Supplier Invoice Number Uniqueness,Comprovar Proveïdor Nombre de factura Singularitat,
 Make Payment via Journal Entry,Fa el pagament via entrada de diari,
 Unlink Payment on Cancellation of Invoice,Desvinculació de Pagament a la cancel·lació de la factura,
-Unlink Advance Payment on Cancelation of Order,Desconnectar de pagament anticipat per cancel·lació de la comanda,
 Book Asset Depreciation Entry Automatically,Llibre d&#39;Actius entrada Depreciació automàticament,
 Automatically Add Taxes and Charges from Item Tax Template,Afegiu automàticament impostos i càrrecs de la plantilla d’impost d’ítems,
 Automatically Fetch Payment Terms,Recupera automàticament els termes de pagament,
@@ -4940,7 +4931,6 @@
 POS Customer Group,POS Grup de Clients,
 POS Field,Camp POS,
 POS Item Group,POS Grup d&#39;articles,
-[Select],[Seleccionar],
 Company Address,Direcció de l&#39;empresa,
 Update Stock,Actualització de Stock,
 Ignore Pricing Rule,Ignorar Regla preus,
@@ -6481,7 +6471,6 @@
 Appraisal Template,Plantilla d'Avaluació,
 For Employee Name,Per Nom de l'Empleat,
 Goals,Objectius,
-Calculate Total Score,Calcular Puntuació total,
 Total Score (Out of 5),Puntuació total (de 5),
 "Any other remarks, noteworthy effort that should go in the records.","Altres observacions, esforç notable que ha d&#39;anar en els registres.",
 Appraisal Goal,Avaluació Meta,
@@ -6599,11 +6588,6 @@
 Reason for Leaving,Raons per deixar el,
 Leave Encashed?,Leave Encashed?,
 Encashment Date,Data Cobrament,
-Exit Interview Details,Detalls de l'entrevista final,
-Held On,Held On,
-Reason for Resignation,Motiu del cessament,
-Better Prospects,Millors perspectives,
-Health Concerns,Problemes de Salut,
 New Workplace,Nou lloc de treball,
 HR-EAD-.YYYY.-,HR-EAD -YYYY.-,
 Returned Amount,Import retornat,
@@ -8239,9 +8223,6 @@
 Manufacturers used in Items,Fabricants utilitzats en articles,
 Limited to 12 characters,Limitat a 12 caràcters,
 MAT-MR-.YYYY.-,MAT-MR.- AAAA.-,
-Set Warehouse,Establir magatzem,
-Sets 'For Warehouse' in each row of the Items table.,Estableix &quot;Per a magatzem&quot; a cada fila de la taula Elements.,
-Requested For,Requerida Per,
 Partially Ordered,Parcialment ordenat,
 Transferred,transferit,
 % Ordered,Demanem%,
@@ -8690,8 +8671,6 @@
 Select warehouse for material requests,Seleccioneu un magatzem per a sol·licituds de material,
 Transfer Materials For Warehouse {0},Transferència de materials per a magatzem {0},
 Production Plan Material Request Warehouse,Pla de producció Sol·licitud de material Magatzem,
-Set From Warehouse,Establert des del magatzem,
-Source Warehouse (Material Transfer),Magatzem font (transferència de material),
 Sets 'Source Warehouse' in each row of the items table.,Estableix &quot;Magatzem font&quot; a cada fila de la taula d&#39;elements.,
 Sets 'Target Warehouse' in each row of the items table.,Estableix &quot;Magatzem objectiu&quot; a cada fila de la taula d&#39;elements.,
 Show Cancelled Entries,Mostra les entrades cancel·lades,
@@ -9157,7 +9136,6 @@
 Is Income Tax Component,És un component de l&#39;Impost sobre la Renda,
 Component properties and references ,Propietats i referències dels components,
 Additional Salary ,Salari addicional,
-Condtion and formula,Condició i fórmula,
 Unmarked days,Dies sense marcar,
 Absent Days,Dies absents,
 Conditions and Formula variable and example,Condició i variable de fórmula i exemple,
@@ -9444,7 +9422,6 @@
 Please check your Plaid client ID and secret values,Comproveu el vostre identificador de client Plaid i els valors secrets,
 Bank transaction creation error,Error de creació de transaccions bancàries,
 Unit of Measurement,Unitat de mesura,
-Row #{}: Selling rate for item {} is lower than its {}. Selling rate should be atleast {},Fila núm. {}: El percentatge de venda de l&#39;article {} és inferior al seu {}. El percentatge de vendes ha de ser mínim {},
 Fiscal Year {0} Does Not Exist,L’any fiscal {0} no existeix,
 Row # {0}: Returned Item {1} does not exist in {2} {3},Fila núm. {0}: l&#39;article retornat {1} no existeix a {2} {3},
 Valuation type charges can not be marked as Inclusive,Els càrrecs per tipus de taxació no es poden marcar com a Inclosius,
@@ -9598,8 +9575,60 @@
 Response Time for {0} priority in row {1} can't be greater than Resolution Time.,El temps de resposta per a la {0} prioritat de la fila {1} no pot ser superior al temps de resolució.,
 {0} is not enabled in {1},{0} no està habilitat a {1},
 Group by Material Request,Agrupa per petició de material,
-"Row {0}: For Supplier {0}, Email Address is Required to Send Email","Fila {0}: per al proveïdor {0}, cal enviar una adreça de correu electrònic",
 Email Sent to Supplier {0},Correu electrònic enviat al proveïdor {0},
 "The Access to Request for Quotation From Portal is Disabled. To Allow Access, Enable it in Portal Settings.","L&#39;accés a la sol·licitud de pressupost des del portal està desactivat. Per permetre l&#39;accés, activeu-lo a Configuració del portal.",
 Supplier Quotation {0} Created,S&#39;ha creat la cotització del proveïdor {0},
 Valid till Date cannot be before Transaction Date,La data vàlida fins a la data no pot ser anterior a la data de la transacció,
+Unlink Advance Payment on Cancellation of Order,Desenllaçar el pagament anticipat de la cancel·lació de la comanda,
+"Simple Python Expression, Example: territory != 'All Territories'","Expressió simple de Python, exemple: territori! = &quot;Tots els territoris&quot;",
+Sales Contributions and Incentives,Contribucions a la venda i incentius,
+Sourced by Supplier,Proveït pel proveïdor,
+Total weightage assigned should be 100%.<br>It is {0},El pes total assignat ha de ser del 100%.<br> És {0},
+Account {0} exists in parent company {1}.,El compte {0} existeix a l&#39;empresa matriu {1}.,
+"To overrule this, enable '{0}' in company {1}","Per anul·lar això, activeu &quot;{0}&quot; a l&#39;empresa {1}",
+Invalid condition expression,Expressió de condició no vàlida,
+Please Select a Company First,Seleccioneu primer una empresa,
+Please Select Both Company and Party Type First,Seleccioneu primer el tipus d’empresa i de festa,
+Provide the invoice portion in percent,Proporcioneu la part de la factura en percentatge,
+Give number of days according to prior selection,Indiqueu el nombre de dies segons la selecció prèvia,
+Email Details,Detalls del correu electrònic,
+"Select a greeting for the receiver. E.g. Mr., Ms., etc.","Seleccioneu una felicitació per al receptor. Per exemple, senyor, senyora, etc.",
+Preview Email,Vista prèvia del correu electrònic,
+Please select a Supplier,Seleccioneu un proveïdor,
+Supplier Lead Time (days),Temps de lliurament del proveïdor (dies),
+"Home, Work, etc.","Llar, feina, etc.",
+Exit Interview Held On,Surt de l&#39;entrevista realitzada,
+Condition and formula,Condició i fórmula,
+Sets 'Target Warehouse' in each row of the Items table.,Estableix &quot;Magatzem objectiu&quot; a cada fila de la taula Elements.,
+Sets 'Source Warehouse' in each row of the Items table.,Estableix &quot;Magatzem font&quot; a cada fila de la taula Elements.,
+POS Register,Registre TPV,
+"Can not filter based on POS Profile, if grouped by POS Profile","No es pot filtrar segons el perfil de TPV, si s&#39;agrupa per perfil de TPV",
+"Can not filter based on Customer, if grouped by Customer","No es pot filtrar en funció del client, si s&#39;agrupa per client",
+"Can not filter based on Cashier, if grouped by Cashier","No es pot filtrar segons el Caixer, si s&#39;agrupa per Caixer",
+Payment Method,Mètode de pagament,
+"Can not filter based on Payment Method, if grouped by Payment Method","No es pot filtrar en funció del mètode de pagament, si s&#39;agrupa per mètode de pagament",
+Supplier Quotation Comparison,Comparació de pressupostos de proveïdors,
+Price per Unit (Stock UOM),Preu per unitat (UOM d’estoc),
+Group by Supplier,Grup per proveïdor,
+Group by Item,Agrupa per ítem,
+Remember to set {field_label}. It is required by {regulation}.,Recordeu establir {field_label}. És obligatori per {reglament}.,
+Enrollment Date cannot be before the Start Date of the Academic Year {0},La data d&#39;inscripció no pot ser anterior a la data d&#39;inici de l&#39;any acadèmic {0},
+Enrollment Date cannot be after the End Date of the Academic Term {0},La data d&#39;inscripció no pot ser posterior a la data de finalització del període acadèmic {0},
+Enrollment Date cannot be before the Start Date of the Academic Term {0},La data d&#39;inscripció no pot ser anterior a la data d&#39;inici del període acadèmic {0},
+Posting future transactions are not allowed due to Immutable Ledger,No es permet la publicació de transaccions futures a causa de Immutable Ledger,
+Future Posting Not Allowed,No es permeten publicacions futures,
+"To enable Capital Work in Progress Accounting, ","Per activar la comptabilitat de treballs en capital,",
+you must select Capital Work in Progress Account in accounts table,heu de seleccionar el compte de capital en curs a la taula de comptes,
+You can also set default CWIP account in Company {},També podeu definir un compte CWIP predeterminat a Company {},
+The Request for Quotation can be accessed by clicking on the following button,Es pot accedir a la sol·licitud de pressupost fent clic al botó següent,
+Regards,Salutacions,
+Please click on the following button to set your new password,Feu clic al botó següent per configurar la vostra nova contrasenya,
+Update Password,Actualitza la contrasenya,
+Row #{}: Selling rate for item {} is lower than its {}. Selling {} should be atleast {},Fila núm. {}: El percentatge de vendes de l&#39;article {} és inferior al seu {}. La venda {} hauria de ser mínima {},
+You can alternatively disable selling price validation in {} to bypass this validation.,També podeu desactivar la validació de preus de venda a {} per evitar aquesta validació.,
+Invalid Selling Price,Preu de venda no vàlid,
+Address needs to be linked to a Company. Please add a row for Company in the Links table.,L’adreça ha d’estar vinculada a una empresa. Afegiu una fila per a Empresa a la taula Enllaços.,
+Company Not Linked,Empresa no vinculada,
+Import Chart of Accounts from CSV / Excel files,Importeu un pla de comptes de fitxers CSV / Excel,
+Completed Qty cannot be greater than 'Qty to Manufacture',La quantitat completada no pot ser superior a &quot;Quantitat per fabricar&quot;,
+"Row {0}: For Supplier {1}, Email Address is Required to send an email","Fila {0}: per al proveïdor {1}, cal enviar una adreça electrònica per enviar un correu electrònic",
diff --git a/erpnext/translations/cs.csv b/erpnext/translations/cs.csv
index 5b149b0..af53603 100644
--- a/erpnext/translations/cs.csv
+++ b/erpnext/translations/cs.csv
@@ -521,7 +521,6 @@
 Chargeble,Chargeble,
 Charges are updated in Purchase Receipt against each item,Poplatky jsou aktualizovány v dokladu o koupi na každou položku,
 "Charges will be distributed proportionately based on item qty or amount, as per your selection","Poplatky budou rozděleny úměrně na základě položky Množství nebo částkou, dle Vašeho výběru",
-Chart Of Accounts,Diagram účtů,
 Chart of Cost Centers,Diagram nákladových středisek,
 Check all,Zkontrolovat vše,
 Checkout,Odhlásit se,
@@ -581,7 +580,6 @@
 Compensatory Off,Vyrovnávací Off,
 Compensatory leave request days not in valid holidays,Kompenzační prázdniny nejsou v platných prázdninách,
 Complaint,Stížnost,
-Completed Qty can not be greater than 'Qty to Manufacture',"Dokončené množství nemůže být větší než ""Množství do výroby""",
 Completion Date,Dokončení Datum,
 Computer,Počítač,
 Condition,Podmínka,
@@ -2033,7 +2031,6 @@
 Please select Charge Type first,"Prosím, vyberte druh tarifu první",
 Please select Company,"Prosím, vyberte Company",
 Please select Company and Designation,Vyberte prosím společnost a označení,
-Please select Company and Party Type first,Vyberte první společnost a Party Typ,
 Please select Company and Posting Date to getting entries,Zvolte prosím datum společnosti a datum odevzdání,
 Please select Company first,"Prosím, vyberte první firma",
 Please select Completion Date for Completed Asset Maintenance Log,Zvolte datum dokončení dokončeného protokolu údržby aktiv,
@@ -2980,7 +2977,6 @@
 The name of your company for which you are setting up this system.,"Název vaší společnosti, pro kterou nastavení tohoto systému.",
 The number of shares and the share numbers are inconsistent,Počet akcií a čísla akcií je nekonzistentní,
 The payment gateway account in plan {0} is different from the payment gateway account in this payment request,Účet platební brány v plánu {0} se liší od účtu platební brány v této žádosti o platbu,
-The request for quotation can be accessed by clicking on the following link,Žádost o cenovou nabídku lze přistupovat kliknutím na následující odkaz,
 The selected BOMs are not for the same item,Vybrané kusovníky nejsou stejné položky,
 The selected item cannot have Batch,Vybraná položka nemůže mít dávku,
 The seller and the buyer cannot be the same,Prodávající a kupující nemohou být stejní,
@@ -3130,7 +3126,6 @@
 Total flexible benefit component amount {0} should not be less than max benefits {1},Celková částka pružné výhody {0} by neměla být menší než maximální dávka {1},
 Total hours: {0},Celkem hodin: {0},
 Total leaves allocated is mandatory for Leave Type {0},Celkový počet přidělených listů je povinný pro typ dovolené {0},
-Total weightage assigned should be 100%. It is {0},Celková weightage přiřazen by měla být 100%. Je {0},
 Total working hours should not be greater than max working hours {0},Celkem pracovní doba by neměla být větší než maximální pracovní doby {0},
 Total {0} ({1}),Celkem {0} ({1}),
 "Total {0} for all items is zero, may be you should change 'Distribute Charges Based On'","Celkem {0} pro všechny položky je nula, může být byste měli změnit &quot;Rozdělte poplatků založený na&quot;",
@@ -3544,7 +3539,6 @@
 Company field is required,Pole společnosti je povinné,
 Creating Dimensions...,Vytváření dimenzí ...,
 Duplicate entry against the item code {0} and manufacturer {1},Duplicitní zadání oproti kódu položky {0} a výrobci {1},
-Import Chart Of Accounts from CSV / Excel files,Importujte graf účtů ze souborů CSV / Excel,
 Invalid GSTIN! The input you've entered doesn't match the GSTIN format for UIN Holders or Non-Resident OIDAR Service Providers,Neplatný GSTIN! Zadaný vstup neodpovídá formátu GSTIN pro držitele UIN nebo nerezidentní poskytovatele služeb OIDAR,
 Invoice Grand Total,Faktura celkem celkem,
 Last carbon check date cannot be a future date,Datum poslední kontroly uhlíku nemůže být budoucí,
@@ -3921,7 +3915,6 @@
 Plaid public token error,Plaid public token error,
 Plaid transactions sync error,Chyba synchronizace plaidních transakcí,
 Please check the error log for details about the import errors,Podrobnosti o chybách importu naleznete v protokolu chyb,
-Please click on the following link to set your new password,"Prosím klikněte na následující odkaz, pro nastavení nového hesla",
 Please create <b>DATEV Settings</b> for Company <b>{}</b>.,Vytvořte prosím <b>nastavení DATEV</b> pro společnost <b>{}</b> .,
 Please create adjustment Journal Entry for amount {0} ,Vytvořte prosím opravný zápis do deníku o částku {0},
 Please do not create more than 500 items at a time,Nevytvářejte více než 500 položek najednou,
@@ -3997,6 +3990,7 @@
 Release date must be in the future,Datum vydání musí být v budoucnosti,
 Relieving Date must be greater than or equal to Date of Joining,Datum vydání musí být větší nebo rovno Datum připojení,
 Rename,Přejmenovat,
+Rename Not Allowed,Přejmenovat není povoleno,
 Repayment Method is mandatory for term loans,Způsob splácení je povinný pro termínované půjčky,
 Repayment Start Date is mandatory for term loans,Datum zahájení splácení je povinné pro termínované půjčky,
 Report Item,Položka sestavy,
@@ -4043,7 +4037,6 @@
 Select All,Vybrat vše,
 Select Difference Account,Vyberte rozdílový účet,
 Select a Default Priority.,Vyberte výchozí prioritu.,
-Select a Supplier from the Default Supplier List of the items below.,Vyberte dodavatele z výchozího seznamu dodavatelů níže uvedených položek.,
 Select a company,Vyberte společnost,
 Select finance book for the item {0} at row {1},Vyberte finanční knihu pro položku {0} v řádku {1},
 Select only one Priority as Default.,Jako výchozí vyberte pouze jednu prioritu.,
@@ -4247,7 +4240,6 @@
 Actual ,Aktuální,
 Add to cart,Přidat do košíku,
 Budget,Rozpočet,
-Chart Of Accounts Importer,Dovozce grafů účtů,
 Chart of Accounts,Graf účtů,
 Customer database.,Databáze zákazníků.,
 Days Since Last order,Počet dnů od poslední objednávky,
@@ -4546,7 +4538,6 @@
 Check Supplier Invoice Number Uniqueness,"Zkontrolujte, zda dodavatelské faktury Počet Jedinečnost",
 Make Payment via Journal Entry,Provést platbu přes Journal Entry,
 Unlink Payment on Cancellation of Invoice,Odpojit Platba o zrušení faktury,
-Unlink Advance Payment on Cancelation of Order,Odpojte zálohy na zrušení objednávky,
 Book Asset Depreciation Entry Automatically,Zúčtování odpisu majetku na účet automaticky,
 Automatically Add Taxes and Charges from Item Tax Template,Automaticky přidávat daně a poplatky ze šablony položky daně,
 Automatically Fetch Payment Terms,Automaticky načíst platební podmínky,
@@ -4940,7 +4931,6 @@
 POS Customer Group,POS Customer Group,
 POS Field,Pole POS,
 POS Item Group,POS položky Group,
-[Select],[Vybrat],
 Company Address,adresa společnosti,
 Update Stock,Aktualizace skladem,
 Ignore Pricing Rule,Ignorovat Ceny pravidlo,
@@ -6481,7 +6471,6 @@
 Appraisal Template,Posouzení Template,
 For Employee Name,Pro jméno zaměstnance,
 Goals,Cíle,
-Calculate Total Score,Vypočítat Celková skóre,
 Total Score (Out of 5),Celkové skóre (Out of 5),
 "Any other remarks, noteworthy effort that should go in the records.","Jakékoli jiné poznámky, pozoruhodné úsilí, které by měly jít v záznamech.",
 Appraisal Goal,Posouzení Goal,
@@ -6599,11 +6588,6 @@
 Reason for Leaving,Důvod Leaving,
 Leave Encashed?,Dovolená proplacena?,
 Encashment Date,Inkaso Datum,
-Exit Interview Details,Exit Rozhovor Podrobnosti,
-Held On,Které se konalo dne,
-Reason for Resignation,Důvod rezignace,
-Better Prospects,Lepší vyhlídky,
-Health Concerns,Zdravotní Obavy,
 New Workplace,Nové pracoviště,
 HR-EAD-.YYYY.-,HR-EAD-.YYYY.-,
 Returned Amount,Vrácená částka,
@@ -8239,9 +8223,6 @@
 Manufacturers used in Items,Výrobci používané v bodech,
 Limited to 12 characters,Omezeno na 12 znaků,
 MAT-MR-.YYYY.-,MAT-MR-.YYYY.-,
-Set Warehouse,Nastavit sklad,
-Sets 'For Warehouse' in each row of the Items table.,Nastaví v každém řádku tabulky „For Warehouse“.,
-Requested For,Požadovaných pro,
 Partially Ordered,Částečně objednáno,
 Transferred,Přestoupil,
 % Ordered,% objednáno,
@@ -8690,8 +8671,6 @@
 Select warehouse for material requests,Vyberte sklad pro požadavky na materiál,
 Transfer Materials For Warehouse {0},Přenos materiálů do skladu {0},
 Production Plan Material Request Warehouse,Sklad požadavku na materiál výrobního plánu,
-Set From Warehouse,Nastaveno ze skladu,
-Source Warehouse (Material Transfer),Zdrojový sklad (přenos materiálu),
 Sets 'Source Warehouse' in each row of the items table.,Nastaví v každém řádku tabulky položek „Zdrojový sklad“.,
 Sets 'Target Warehouse' in each row of the items table.,Nastaví v každém řádku tabulky položek „Target Warehouse“.,
 Show Cancelled Entries,Zobrazit zrušené položky,
@@ -9157,7 +9136,6 @@
 Is Income Tax Component,Je složkou daně z příjmu,
 Component properties and references ,Vlastnosti komponent a odkazy,
 Additional Salary ,Dodatečný plat,
-Condtion and formula,Podmínky a vzorec,
 Unmarked days,Neoznačené dny,
 Absent Days,Chybějící dny,
 Conditions and Formula variable and example,Podmínky a proměnná vzorce a příklad,
@@ -9444,7 +9422,6 @@
 Please check your Plaid client ID and secret values,Zkontrolujte prosím ID klienta a tajné hodnoty,
 Bank transaction creation error,Chyba při vytváření bankovní transakce,
 Unit of Measurement,Jednotka měření,
-Row #{}: Selling rate for item {} is lower than its {}. Selling rate should be atleast {},Řádek {}: Míra prodeje pro položku {} je nižší než její {}. Míra prodeje by měla být alespoň {},
 Fiscal Year {0} Does Not Exist,Fiskální rok {0} neexistuje,
 Row # {0}: Returned Item {1} does not exist in {2} {3},Řádek č. {0}: Vrácená položka {1} neexistuje v doméně {2} {3},
 Valuation type charges can not be marked as Inclusive,Poplatky typu ocenění nelze označit jako inkluzivní,
@@ -9598,8 +9575,60 @@
 Response Time for {0} priority in row {1} can't be greater than Resolution Time.,Doba odezvy pro {0} prioritu v řádku {1} nesmí být větší než doba rozlišení.,
 {0} is not enabled in {1},{0} není povolen v {1},
 Group by Material Request,Seskupit podle požadavku na materiál,
-"Row {0}: For Supplier {0}, Email Address is Required to Send Email",Řádek {0}: U dodavatele {0} je pro odesílání e-mailů vyžadována e-mailová adresa,
 Email Sent to Supplier {0},E-mail odeslaný dodavateli {0},
 "The Access to Request for Quotation From Portal is Disabled. To Allow Access, Enable it in Portal Settings.","Přístup k žádosti o nabídku z portálu je zakázán. Chcete-li povolit přístup, povolte jej v nastavení portálu.",
 Supplier Quotation {0} Created,Nabídka dodavatele {0} vytvořena,
 Valid till Date cannot be before Transaction Date,Platnost do data nemůže být před datem transakce,
+Unlink Advance Payment on Cancellation of Order,Zrušit propojení zálohy při zrušení objednávky,
+"Simple Python Expression, Example: territory != 'All Territories'","Jednoduchý výraz v Pythonu, příklad: Teritorium! = &#39;Všechna území&#39;",
+Sales Contributions and Incentives,Příspěvky na prodej a pobídky,
+Sourced by Supplier,Zdroj od dodavatele,
+Total weightage assigned should be 100%.<br>It is {0},Celková přidělená hmotnost by měla být 100%.<br> Je to {0},
+Account {0} exists in parent company {1}.,Účet {0} existuje v mateřské společnosti {1}.,
+"To overrule this, enable '{0}' in company {1}","Chcete-li to potlačit, povolte ve společnosti {1} „{0}“",
+Invalid condition expression,Neplatný výraz podmínky,
+Please Select a Company First,Nejprve vyberte společnost,
+Please Select Both Company and Party Type First,Nejprve vyberte prosím společnost a typ strany,
+Provide the invoice portion in percent,Uveďte část faktury v procentech,
+Give number of days according to prior selection,Uveďte počet dní podle předchozího výběru,
+Email Details,E-mailové podrobnosti,
+"Select a greeting for the receiver. E.g. Mr., Ms., etc.","Vyberte pozdrav pro příjemce. Např. Pan, paní atd.",
+Preview Email,Náhled e-mailu,
+Please select a Supplier,Vyberte prosím dodavatele,
+Supplier Lead Time (days),Dodací lhůta dodavatele (dny),
+"Home, Work, etc.","Domov, práce atd.",
+Exit Interview Held On,Exit Interview Holded On,
+Condition and formula,Stav a vzorec,
+Sets 'Target Warehouse' in each row of the Items table.,Nastaví v každém řádku tabulky položek „Cílový sklad“.,
+Sets 'Source Warehouse' in each row of the Items table.,Nastaví „Zdrojový sklad“ v každém řádku tabulky Položky.,
+POS Register,POS registr,
+"Can not filter based on POS Profile, if grouped by POS Profile","Nelze filtrovat na základě POS profilu, pokud je seskupen podle POS profilu",
+"Can not filter based on Customer, if grouped by Customer","Nelze filtrovat na základě zákazníka, pokud je seskupen podle zákazníka",
+"Can not filter based on Cashier, if grouped by Cashier","Nelze filtrovat podle pokladníka, pokud je seskupen podle pokladníka",
+Payment Method,Způsob platby,
+"Can not filter based on Payment Method, if grouped by Payment Method","Nelze filtrovat podle způsobu platby, pokud jsou seskupeny podle způsobu platby",
+Supplier Quotation Comparison,Porovnání nabídky dodavatele,
+Price per Unit (Stock UOM),Cena za jednotku (MJ na skladě),
+Group by Supplier,Seskupit podle dodavatele,
+Group by Item,Seskupit podle položky,
+Remember to set {field_label}. It is required by {regulation}.,Nezapomeňte nastavit {field_label}. Vyžaduje to {nařízení}.,
+Enrollment Date cannot be before the Start Date of the Academic Year {0},Datum zápisu nesmí být dříve než datum zahájení akademického roku {0},
+Enrollment Date cannot be after the End Date of the Academic Term {0},Datum zápisu nesmí být po datu ukončení akademického období {0},
+Enrollment Date cannot be before the Start Date of the Academic Term {0},Datum zápisu nemůže být dříve než datum zahájení akademického období {0},
+Posting future transactions are not allowed due to Immutable Ledger,Zúčtování budoucích transakcí není povoleno kvůli Immutable Ledger,
+Future Posting Not Allowed,Budoucí zveřejňování příspěvků není povoleno,
+"To enable Capital Work in Progress Accounting, ","Chcete-li povolit průběžné účtování kapitálu,",
+you must select Capital Work in Progress Account in accounts table,v tabulce účtů musíte vybrat Účet rozpracovaného kapitálu,
+You can also set default CWIP account in Company {},Ve společnosti {} můžete také nastavit výchozí účet CWIP,
+The Request for Quotation can be accessed by clicking on the following button,Požadavek na nabídku je přístupný kliknutím na následující tlačítko,
+Regards,pozdravy,
+Please click on the following button to set your new password,Kliknutím na následující tlačítko nastavíte nové heslo,
+Update Password,Aktualizujte heslo,
+Row #{}: Selling rate for item {} is lower than its {}. Selling {} should be atleast {},Řádek {}: Míra prodeje pro položku {} je nižší než její {}. Prodej {} by měl být alespoň {},
+You can alternatively disable selling price validation in {} to bypass this validation.,Alternativně můžete deaktivovat ověření prodejní ceny v {} a toto ověření obejít.,
+Invalid Selling Price,Neplatná prodejní cena,
+Address needs to be linked to a Company. Please add a row for Company in the Links table.,Adresu je třeba propojit se společností. V tabulce Odkazy přidejte řádek pro Společnost.,
+Company Not Linked,Společnost není propojena,
+Import Chart of Accounts from CSV / Excel files,Importujte účtovou osnovu ze souborů CSV / Excel,
+Completed Qty cannot be greater than 'Qty to Manufacture',Dokončené množství nemůže být větší než „Množství do výroby“,
+"Row {0}: For Supplier {1}, Email Address is Required to send an email",Řádek {0}: U dodavatele {1} je pro odeslání e-mailu vyžadována e-mailová adresa,
diff --git a/erpnext/translations/da.csv b/erpnext/translations/da.csv
index b077869..38d76ad 100644
--- a/erpnext/translations/da.csv
+++ b/erpnext/translations/da.csv
@@ -521,7 +521,6 @@
 Chargeble,chargeble,
 Charges are updated in Purchase Receipt against each item,Afgifter er opdateret i købskvitteringen for hver enkelt vare,
 "Charges will be distributed proportionately based on item qty or amount, as per your selection","Afgifter vil blive fordelt forholdsmæssigt baseret på post qty eller mængden, som pr dit valg",
-Chart Of Accounts,Kontoplan,
 Chart of Cost Centers,Diagram af omkostningssteder,
 Check all,Vælg alle,
 Checkout,bestilling,
@@ -581,7 +580,6 @@
 Compensatory Off,Kompenserende Off,
 Compensatory leave request days not in valid holidays,Forsøgsfrihed anmodningsdage ikke i gyldige helligdage,
 Complaint,Symptom,
-Completed Qty can not be greater than 'Qty to Manufacture',Afsluttet Antal kan ikke være større end &#39;antal til Fremstilling&#39;,
 Completion Date,Afslutning Dato,
 Computer,Computer,
 Condition,Tilstand,
@@ -2033,7 +2031,6 @@
 Please select Charge Type first,Vælg Charge Type først,
 Please select Company,Vælg firma,
 Please select Company and Designation,Vælg venligst Firma og Betegnelse,
-Please select Company and Party Type first,Vælg Virksomhed og Selskabstype først,
 Please select Company and Posting Date to getting entries,Vælg venligst Company og Posting Date for at få poster,
 Please select Company first,Vælg venligst firma først,
 Please select Completion Date for Completed Asset Maintenance Log,Vælg venligst Afslutningsdato for Udfyldt Asset Maintenance Log,
@@ -2980,7 +2977,6 @@
 The name of your company for which you are setting up this system.,"Navnet på dit firma, som du oprette i dette system.",
 The number of shares and the share numbers are inconsistent,Antallet af aktier og aktienumrene er inkonsekvente,
 The payment gateway account in plan {0} is different from the payment gateway account in this payment request,Betalingsgateway-kontoen i plan {0} er forskellig fra betalingsgateway-kontoen i denne betalingsanmodning,
-The request for quotation can be accessed by clicking on the following link,Tilbudsforespørgslen findes ved at klikke på følgende link,
 The selected BOMs are not for the same item,De valgte styklister er ikke for den samme vare,
 The selected item cannot have Batch,Den valgte vare kan ikke have parti,
 The seller and the buyer cannot be the same,Sælgeren og køberen kan ikke være det samme,
@@ -3130,7 +3126,6 @@
 Total flexible benefit component amount {0} should not be less than max benefits {1},Det samlede beløb for fleksibel fordel {0} bør ikke være mindre end maksimale fordele {1},
 Total hours: {0},Total time: {0},
 Total leaves allocated is mandatory for Leave Type {0},Samlet antal tildelte blade er obligatoriske for Forladetype {0},
-Total weightage assigned should be 100%. It is {0},Samlet weightage tildelt skulle være 100%. Det er {0},
 Total working hours should not be greater than max working hours {0},Arbejdstid i alt bør ikke være større end maksimal arbejdstid {0},
 Total {0} ({1}),I alt {0} ({1}),
 "Total {0} for all items is zero, may be you should change 'Distribute Charges Based On'","I alt {0} for alle punkter er nul, kan være du skal ændre &quot;Fordel afgifter baseret på &#39;",
@@ -3544,7 +3539,6 @@
 Company field is required,Virksomhedsfelt er påkrævet,
 Creating Dimensions...,Opretter dimensioner ...,
 Duplicate entry against the item code {0} and manufacturer {1},Kopiér indtastning mod varekoden {0} og producenten {1},
-Import Chart Of Accounts from CSV / Excel files,Importer oversigt over konti fra CSV / Excel-filer,
 Invalid GSTIN! The input you've entered doesn't match the GSTIN format for UIN Holders or Non-Resident OIDAR Service Providers,"Ugyldig GSTIN! Det input, du har indtastet, stemmer ikke overens med GSTIN-formatet for UIN-indehavere eller ikke-residente OIDAR-tjenesteudbydere",
 Invoice Grand Total,Faktura Grand Total,
 Last carbon check date cannot be a future date,Sidste dato for kulstofkontrol kan ikke være en fremtidig dato,
@@ -3921,7 +3915,6 @@
 Plaid public token error,Plaid public token error,
 Plaid transactions sync error,Fejl i synkronisering af pladetransaktioner,
 Please check the error log for details about the import errors,Kontroller fejlloggen for detaljer om importfejl,
-Please click on the following link to set your new password,Klik på følgende link for at indstille din nye adgangskode,
 Please create <b>DATEV Settings</b> for Company <b>{}</b>.,Opret venligst <b>DATEV-indstillinger</b> for firma <b>{}</b> .,
 Please create adjustment Journal Entry for amount {0} ,Opret venligst justering af journalindtastning for beløb {0},
 Please do not create more than 500 items at a time,Opret venligst ikke mere end 500 varer ad gangen,
@@ -3997,6 +3990,7 @@
 Release date must be in the future,Udgivelsesdato skal være i fremtiden,
 Relieving Date must be greater than or equal to Date of Joining,Fritagelsesdato skal være større end eller lig med tiltrædelsesdato,
 Rename,Omdøb,
+Rename Not Allowed,Omdøb ikke tilladt,
 Repayment Method is mandatory for term loans,Tilbagebetalingsmetode er obligatorisk for kortfristede lån,
 Repayment Start Date is mandatory for term loans,Startdato for tilbagebetaling er obligatorisk for kortfristede lån,
 Report Item,Rapporter element,
@@ -4043,7 +4037,6 @@
 Select All,Vælg alt,
 Select Difference Account,Vælg Difference Account,
 Select a Default Priority.,Vælg en standardprioritet.,
-Select a Supplier from the Default Supplier List of the items below.,Vælg en leverandør fra standardleverandørlisten med nedenstående varer.,
 Select a company,Vælg et firma,
 Select finance book for the item {0} at row {1},Vælg finansbog for varen {0} i række {1},
 Select only one Priority as Default.,Vælg kun en prioritet som standard.,
@@ -4247,7 +4240,6 @@
 Actual ,Faktiske,
 Add to cart,Føj til indkøbsvogn,
 Budget,Budget,
-Chart Of Accounts Importer,Kontoplan for importør,
 Chart of Accounts,Kontoplan,
 Customer database.,Kundedatabase.,
 Days Since Last order,Dage siden sidste ordre,
@@ -4546,7 +4538,6 @@
 Check Supplier Invoice Number Uniqueness,Tjek entydigheden af  leverandørfakturanummeret,
 Make Payment via Journal Entry,Foretag betaling via kassekladden,
 Unlink Payment on Cancellation of Invoice,Fjern link Betaling ved Annullering af faktura,
-Unlink Advance Payment on Cancelation of Order,Fjern tilknytning til forskud ved annullering af ordre,
 Book Asset Depreciation Entry Automatically,Bogføring af aktivernes afskrivning automatisk,
 Automatically Add Taxes and Charges from Item Tax Template,Tilføj automatisk skatter og afgifter fra vareskatteskabelonen,
 Automatically Fetch Payment Terms,Hent automatisk betalingsbetingelser,
@@ -4940,7 +4931,6 @@
 POS Customer Group,Kassesystem-kundegruppe,
 POS Field,POS felt,
 POS Item Group,Kassesystem-varegruppe,
-[Select],[Vælg],
 Company Address,Virksomhedsadresse,
 Update Stock,Opdatering Stock,
 Ignore Pricing Rule,Ignorér prisfastsættelsesregel,
@@ -6481,7 +6471,6 @@
 Appraisal Template,Vurderingsskabelon,
 For Employee Name,Til medarbejdernavn,
 Goals,Mål,
-Calculate Total Score,Beregn Total Score,
 Total Score (Out of 5),Samlet score (ud af 5),
 "Any other remarks, noteworthy effort that should go in the records.","Alle andre bemærkninger, bemærkelsesværdigt indsats, skal gå i registrene.",
 Appraisal Goal,Vurderingsmål,
@@ -6599,11 +6588,6 @@
 Reason for Leaving,Årsag til Leaving,
 Leave Encashed?,Skal fravær udbetales?,
 Encashment Date,Indløsningsdato,
-Exit Interview Details,Exit Interview Detaljer,
-Held On,Held On,
-Reason for Resignation,Årsag til Udmeldelse,
-Better Prospects,Bedre udsigter,
-Health Concerns,Sundhedsmæssige betænkeligheder,
 New Workplace,Ny Arbejdsplads,
 HR-EAD-.YYYY.-,HR-EAD-.YYYY.-,
 Returned Amount,Returneret beløb,
@@ -8239,9 +8223,6 @@
 Manufacturers used in Items,"Producenter, der anvendes i artikler",
 Limited to 12 characters,Begrænset til 12 tegn,
 MAT-MR-.YYYY.-,MAT-MR-.YYYY.-,
-Set Warehouse,Indstil lager,
-Sets 'For Warehouse' in each row of the Items table.,Indstiller &#39;For lager&#39; i hver række i tabellen Varer.,
-Requested For,Anmodet om,
 Partially Ordered,Delvist bestilt,
 Transferred,overført,
 % Ordered,% Bestilt,
@@ -8690,8 +8671,6 @@
 Select warehouse for material requests,Vælg lager til materialeanmodninger,
 Transfer Materials For Warehouse {0},Overfør materiale til lager {0},
 Production Plan Material Request Warehouse,Produktionsplan Materialeanmodningslager,
-Set From Warehouse,Sæt fra lager,
-Source Warehouse (Material Transfer),Kildelager (overførsel af materiale),
 Sets 'Source Warehouse' in each row of the items table.,Indstiller &#39;Source Warehouse&#39; i hver række i varetabellen.,
 Sets 'Target Warehouse' in each row of the items table.,Indstiller &#39;Target Warehouse&#39; i hver række i varetabellen.,
 Show Cancelled Entries,Vis annullerede poster,
@@ -9157,7 +9136,6 @@
 Is Income Tax Component,Er indkomstskatkomponent,
 Component properties and references ,Komponentegenskaber og referencer,
 Additional Salary ,Yderligere løn,
-Condtion and formula,Konduktion og formel,
 Unmarked days,Umarkerede dage,
 Absent Days,Fraværende dage,
 Conditions and Formula variable and example,Betingelser og formelvariabel og eksempel,
@@ -9444,7 +9422,6 @@
 Please check your Plaid client ID and secret values,Kontroller dit Plaid-klient-id og hemmelige værdier,
 Bank transaction creation error,Fejl ved oprettelse af banktransaktioner,
 Unit of Measurement,Måleenhed,
-Row #{}: Selling rate for item {} is lower than its {}. Selling rate should be atleast {},Række nr. {}: Sælgeraten for varen {} er lavere end dens {}. Sælgesatsen skal være mindst {},
 Fiscal Year {0} Does Not Exist,Regnskabsår {0} eksisterer ikke,
 Row # {0}: Returned Item {1} does not exist in {2} {3},Række nr. {0}: Returneret vare {1} findes ikke i {2} {3},
 Valuation type charges can not be marked as Inclusive,Gebyrer for værdiansættelse kan ikke markeres som inklusiv,
@@ -9598,8 +9575,60 @@
 Response Time for {0} priority in row {1} can't be greater than Resolution Time.,Svartid for {0} prioritet i række {1} kan ikke være længere end opløsningstid.,
 {0} is not enabled in {1},{0} er ikke aktiveret i {1},
 Group by Material Request,Gruppér efter materialeanmodning,
-"Row {0}: For Supplier {0}, Email Address is Required to Send Email",Række {0}: For leverandør {0} kræves e-mail-adresse for at sende e-mail,
 Email Sent to Supplier {0},E-mail sendt til leverandør {0},
 "The Access to Request for Quotation From Portal is Disabled. To Allow Access, Enable it in Portal Settings.",Adgangen til anmodning om tilbud fra portal er deaktiveret. For at give adgang skal du aktivere den i portalindstillinger.,
 Supplier Quotation {0} Created,Leverandørstilbud {0} Oprettet,
 Valid till Date cannot be before Transaction Date,Gyldig till-dato kan ikke være før transaktionsdato,
+Unlink Advance Payment on Cancellation of Order,Fjern link til forskud ved annullering af ordren,
+"Simple Python Expression, Example: territory != 'All Territories'","Enkel Python-udtryk, Eksempel: territorium! = &#39;Alle territorier&#39;",
+Sales Contributions and Incentives,Salgsbidrag og incitamenter,
+Sourced by Supplier,Oprindelig fra leverandør,
+Total weightage assigned should be 100%.<br>It is {0},Den samlede tildelte vægt skal være 100%.<br> Det er {0},
+Account {0} exists in parent company {1}.,Konto {0} findes i moderselskabet {1}.,
+"To overrule this, enable '{0}' in company {1}",For at tilsidesætte dette skal du aktivere &#39;{0}&#39; i firmaet {1},
+Invalid condition expression,Ugyldigt udtryk for tilstand,
+Please Select a Company First,Vælg først et firma,
+Please Select Both Company and Party Type First,Vælg både firma og festtype først,
+Provide the invoice portion in percent,Angiv fakturadelen i procent,
+Give number of days according to prior selection,Angiv antal dage i henhold til forudgående valg,
+Email Details,E-mail-oplysninger,
+"Select a greeting for the receiver. E.g. Mr., Ms., etc.","Vælg en hilsen til modtageren. F.eks. Hr., Fru osv.",
+Preview Email,Eksempel på e-mail,
+Please select a Supplier,Vælg en leverandør,
+Supplier Lead Time (days),Leveringstid (dage),
+"Home, Work, etc.","Hjem, arbejde osv.",
+Exit Interview Held On,Afslut interview afholdt,
+Condition and formula,Tilstand og formel,
+Sets 'Target Warehouse' in each row of the Items table.,Indstiller &#39;Target Warehouse&#39; i hver række i varetabellen.,
+Sets 'Source Warehouse' in each row of the Items table.,Indstiller &#39;Source Warehouse&#39; i hver række i tabellen Items.,
+POS Register,POS-register,
+"Can not filter based on POS Profile, if grouped by POS Profile","Kan ikke filtrere baseret på POS-profil, hvis grupperet efter POS-profil",
+"Can not filter based on Customer, if grouped by Customer","Kan ikke filtrere baseret på kunde, hvis grupperet efter kunde",
+"Can not filter based on Cashier, if grouped by Cashier","Kan ikke filtrere baseret på kasser, hvis grupperet efter kasser",
+Payment Method,Betalingsmetode,
+"Can not filter based on Payment Method, if grouped by Payment Method","Kan ikke filtrere baseret på betalingsmetode, hvis grupperet efter betalingsmetode",
+Supplier Quotation Comparison,Sammenligning af tilbud fra leverandører,
+Price per Unit (Stock UOM),Pris pr. Enhed (lager UOM),
+Group by Supplier,Grupper efter leverandør,
+Group by Item,Gruppér efter vare,
+Remember to set {field_label}. It is required by {regulation}.,Husk at indstille {field_label}. Det kræves af {regulering}.,
+Enrollment Date cannot be before the Start Date of the Academic Year {0},Tilmeldingsdato kan ikke være før startdatoen for det akademiske år {0},
+Enrollment Date cannot be after the End Date of the Academic Term {0},Tilmeldingsdato kan ikke være efter slutdatoen for den akademiske periode {0},
+Enrollment Date cannot be before the Start Date of the Academic Term {0},Tilmeldingsdato kan ikke være før startdatoen for den akademiske periode {0},
+Posting future transactions are not allowed due to Immutable Ledger,Det er ikke tilladt at bogføre fremtidige transaktioner på grund af Immutable Ledger,
+Future Posting Not Allowed,Fremtidig udstationering ikke tilladt,
+"To enable Capital Work in Progress Accounting, ","For at aktivere Capital Work in Progress Accounting,",
+you must select Capital Work in Progress Account in accounts table,du skal vælge Capital Work in Progress konto i kontotabellen,
+You can also set default CWIP account in Company {},Du kan også indstille CWIP-standardkonto i Company {},
+The Request for Quotation can be accessed by clicking on the following button,Anmodningen om tilbud kan fås ved at klikke på følgende knap,
+Regards,Hilsen,
+Please click on the following button to set your new password,Klik på følgende knap for at indstille din nye adgangskode,
+Update Password,Opdater adgangskode,
+Row #{}: Selling rate for item {} is lower than its {}. Selling {} should be atleast {},Række nr. {}: Sælgeraten for varen {} er lavere end dens {}. Salg {} skal mindst være {},
+You can alternatively disable selling price validation in {} to bypass this validation.,Du kan alternativt deaktivere validering af salgspris i {} for at omgå denne validering.,
+Invalid Selling Price,Ugyldig salgspris,
+Address needs to be linked to a Company. Please add a row for Company in the Links table.,Adresse skal knyttes til et firma. Tilføj en række for firma i tabellen Links.,
+Company Not Linked,Virksomhed ikke tilknyttet,
+Import Chart of Accounts from CSV / Excel files,Importer kontoplan fra CSV / Excel-filer,
+Completed Qty cannot be greater than 'Qty to Manufacture',Udført antal kan ikke være større end &#39;Antal til fremstilling&#39;,
+"Row {0}: For Supplier {1}, Email Address is Required to send an email",Række {0}: For leverandør {1} kræves e-mail-adresse for at sende en e-mail,
diff --git a/erpnext/translations/de.csv b/erpnext/translations/de.csv
index 8196d6c..1b50204 100644
--- a/erpnext/translations/de.csv
+++ b/erpnext/translations/de.csv
@@ -13,7 +13,7 @@
 'Total','Gesamtbetrag',
 'Update Stock' can not be checked because items are not delivered via {0},"""Lager aktualisieren"" kann nicht ausgewählt werden, da Artikel nicht über {0} geliefert wurden",
 'Update Stock' cannot be checked for fixed asset sale,Beim Verkauf von Anlagevermögen darf 'Lagerbestand aktualisieren' nicht ausgewählt sein.,
-) for {0},) para {0},
+) for {0},) für {0},
 1 exact match.,1 genaue Übereinstimmung.,
 90-Above,Über 90,
 A Customer Group exists with same name please change the Customer name or rename the Customer Group,Eine Kundengruppe mit dem gleichen Namen existiert bereits. Bitte den Kundennamen ändern oder die Kundengruppe umbenennen,
@@ -496,7 +496,7 @@
 Cart is Empty,Der Warenkorb ist leer,
 Case No(s) already in use. Try from Case No {0},Fall-Nr. (n) bereits in Verwendung. Versuchen Sie eine Fall-Nr. ab {0},
 Cash,Bargeld,
-Cash Flow Statement,Geldflussrechnung,
+Cash Flow Statement,Kapitalflussrechnung,
 Cash Flow from Financing,Cashflow aus Finanzierung,
 Cash Flow from Investing,Cashflow aus Investitionen,
 Cash Flow from Operations,Cashflow aus Geschäftstätigkeit,
@@ -521,7 +521,6 @@
 Chargeble,Belastung,
 Charges are updated in Purchase Receipt against each item,Kosten werden im Kaufbeleg für jede Position aktualisiert,
 "Charges will be distributed proportionately based on item qty or amount, as per your selection",Die Kosten werden gemäß Ihrer Wahl anteilig verteilt basierend auf Artikelmenge oder -preis,
-Chart Of Accounts,Kontenplan,
 Chart of Cost Centers,Kostenstellenplan,
 Check all,Alle prüfen,
 Checkout,Kasse,
@@ -530,7 +529,7 @@
 Cheque/Reference No,Scheck-/ Referenznummer,
 Cheques Required,Überprüfungen erforderlich,
 Cheques and Deposits incorrectly cleared,Schecks und Kautionen fälschlicherweise gelöscht,
-Child Task exists for this Task. You can not delete this Task.,Für diese Aufgabe existiert eine untergeordnete Aufgabe. Sie können diese Aufgabe daher nicht löschen.,
+Child Task exists for this Task. You can not delete this Task.,Für diesen Vorgang existiert ein untergeordneter Vorgang. Sie können diesen daher nicht löschen.,
 Child nodes can be only created under 'Group' type nodes,Unterknoten können nur unter Gruppenknoten erstellt werden.,
 Child warehouse exists for this warehouse. You can not delete this warehouse.,Für dieses Lager existieren untergordnete Lager vorhanden. Sie können dieses Lager daher nicht löschen.,
 Circular Reference Error,Zirkelschluss-Fehler,
@@ -539,7 +538,7 @@
 Claimed Amount,Anspruchsbetrag,
 Clay,Lehm,
 Clear filters,Filter löschen,
-Clear values,Klare Werte,
+Clear values,Werte löschen,
 Clearance Date,Abrechnungsdatum,
 Clearance Date not mentioned,Abrechnungsdatum nicht erwähnt,
 Clearance Date updated,Abrechnungsdatum aktualisiert,
@@ -581,7 +580,6 @@
 Compensatory Off,Ausgleich für,
 Compensatory leave request days not in valid holidays,"Tage des Ausgleichsurlaubs, die nicht in den gültigen Feiertagen sind",
 Complaint,Beschwerde,
-Completed Qty can not be greater than 'Qty to Manufacture',"Gefertigte Menge kann nicht größer sein als ""Menge für Herstellung""",
 Completion Date,Fertigstellungstermin,
 Computer,Rechner,
 Condition,Zustand,
@@ -986,7 +984,7 @@
 Excise Invoice,Verbrauch Rechnung,
 Execution,Ausführung,
 Executive Search,Direktsuche,
-Expand All,Alle erweitern,
+Expand All,Alle ausklappen,
 Expected Delivery Date,Geplanter Liefertermin,
 Expected Delivery Date should be after Sales Order Date,Voraussichtlicher Liefertermin sollte nach Kundenauftragsdatum erfolgen,
 Expected End Date,Voraussichtliches Enddatum,
@@ -1042,7 +1040,7 @@
 Finance Book,Finanzbuch,
 Financial / accounting year.,Finanz-/Rechnungsjahr,
 Financial Services,Finanzdienstleistungen,
-Financial Statements,Jahresabschluss,
+Financial Statements,Finanzberichte,
 Financial Year,Geschäftsjahr,
 Finish,Fertig,
 Finished Good,Gut beendet,
@@ -1667,7 +1665,7 @@
 New BOM,Neue Stückliste,
 New Batch ID (Optional),Neue Batch-ID (optional),
 New Batch Qty,Neue Batch-Menge,
-New Company,Neues Unternehmen,
+New Company,Neues Unternehmen anlegen,
 New Cost Center Name,Neuer Kostenstellenname,
 New Customer Revenue,Neuer Kundenumsatz,
 New Customers,neue Kunden,
@@ -1803,7 +1801,7 @@
 Opening Date and Closing Date should be within same Fiscal Year,Eröffnungsdatum und Abschlussdatum sollten im gleichen Geschäftsjahr sein,
 Opening Date should be before Closing Date,Eröffnungsdatum sollte vor dem Abschlussdatum liegen,
 Opening Entry Journal,Eröffnungseintragsjournal,
-Opening Invoice Creation Tool,Öffnen des Rechnungserstellungswerkzeugs,
+Opening Invoice Creation Tool,Offene Rechnungen übertragen,
 Opening Invoice Item,Rechnungsposition öffnen,
 Opening Invoices,Rechnungen öffnen,
 Opening Invoices Summary,Rechnungszusammenfassung öffnen,
@@ -2033,7 +2031,6 @@
 Please select Charge Type first,Bitte zuerst Chargentyp auswählen,
 Please select Company,Bitte Unternehmen auswählen,
 Please select Company and Designation,Bitte wählen Sie Unternehmen und Stelle,
-Please select Company and Party Type first,Bitte zuerst Unternehmen und Gruppentyp auswählen,
 Please select Company and Posting Date to getting entries,"Bitte wählen Sie Unternehmen und Buchungsdatum, um Einträge zu erhalten",
 Please select Company first,Bitte zuerst Unternehmen auswählen,
 Please select Completion Date for Completed Asset Maintenance Log,Bitte wählen Sie Fertigstellungsdatum für das abgeschlossene Wartungsprotokoll für den Vermögenswert,
@@ -2223,7 +2220,7 @@
 Projected Qty,Projizierte Menge,
 Projected Quantity Formula,Formel für projizierte Menge,
 Projects,Projekte,
-Property,Eigentum,
+Property,Eigenschaft,
 Property already added,Die Eigenschaft wurde bereits hinzugefügt,
 Proposal Writing,Verfassen von Angeboten,
 Proposal/Price Quote,Angebot / Preis Angebot,
@@ -2536,7 +2533,7 @@
 Sales Invoice {0} must be cancelled before cancelling this Sales Order,Ausgangsrechnung {0} muss vor Stornierung dieses Kundenauftrags abgebrochen werden,
 Sales Manager,Vertriebsleiter,
 Sales Master Manager,Hauptvertriebsleiter,
-Sales Order,Kundenauftrag,
+Sales Order,Auftragsbestätigung,
 Sales Order Item,Kundenauftrags-Artikel,
 Sales Order required for Item {0},Kundenauftrag für den Artikel {0} erforderlich,
 Sales Order to Payment,Vom Kundenauftrag zum Zahlungseinang,
@@ -2980,7 +2977,6 @@
 The name of your company for which you are setting up this system.,"Firma des Unternehmens, für das dieses System eingerichtet wird.",
 The number of shares and the share numbers are inconsistent,Die Anzahl der Aktien und die Aktienanzahl sind inkonsistent,
 The payment gateway account in plan {0} is different from the payment gateway account in this payment request,Das Zahlungsgatewaykonto in Plan {0} unterscheidet sich von dem Zahlungsgatewaykonto in dieser Zahlungsanforderung,
-The request for quotation can be accessed by clicking on the following link,Die Angebotsanfrage kann durch einen Klick auf den folgenden Link abgerufen werden,
 The selected BOMs are not for the same item,Die ausgewählten Stücklisten sind nicht für den gleichen Artikel,
 The selected item cannot have Batch,Der ausgewählte Artikel kann keine Charge haben,
 The seller and the buyer cannot be the same,Der Verkäufer und der Käufer können nicht identisch sein,
@@ -3130,7 +3126,6 @@
 Total flexible benefit component amount {0} should not be less than max benefits {1},Der Gesamtbetrag der flexiblen Leistungskomponente {0} sollte nicht unter dem Höchstbetrag der Leistungen {1} liegen.,
 Total hours: {0},Stundenzahl: {0},
 Total leaves allocated is mandatory for Leave Type {0},Die Gesamtzahl der zugewiesenen Blätter ist für Abwesenheitsart {0} erforderlich.,
-Total weightage assigned should be 100%. It is {0},Summe der zugeordneten Gewichtungen sollte 100% sein. Sie ist {0},
 Total working hours should not be greater than max working hours {0},Insgesamt Arbeitszeit sollte nicht größer sein als die maximale Arbeitszeit {0},
 Total {0} ({1}),Insgesamt {0} ({1}),
 "Total {0} for all items is zero, may be you should change 'Distribute Charges Based On'","Insgesamt {0} für alle Elemente gleich Null ist, sein kann, sollten Sie &quot;Verteilen Gebühren auf der Grundlage&quot; ändern",
@@ -3544,7 +3539,6 @@
 Company field is required,Firmenfeld ist erforderlich,
 Creating Dimensions...,Dimensionen erstellen ...,
 Duplicate entry against the item code {0} and manufacturer {1},Doppelte Eingabe gegen Artikelcode {0} und Hersteller {1},
-Import Chart Of Accounts from CSV / Excel files,Kontenplan aus CSV / Excel-Dateien importieren,
 Invalid GSTIN! The input you've entered doesn't match the GSTIN format for UIN Holders or Non-Resident OIDAR Service Providers,Ungültige GSTIN! Die von Ihnen eingegebene Eingabe stimmt nicht mit dem GSTIN-Format für UIN-Inhaber oder gebietsfremde OIDAR-Dienstanbieter überein,
 Invoice Grand Total,Rechnungssumme,
 Last carbon check date cannot be a future date,Das Datum der letzten Kohlenstoffprüfung kann kein zukünftiges Datum sein,
@@ -3921,7 +3915,6 @@
 Plaid public token error,Plaid public token error,
 Plaid transactions sync error,Synchronisierungsfehler für Plaid-Transaktionen,
 Please check the error log for details about the import errors,Überprüfen Sie das Fehlerprotokoll auf Details zu den Importfehlern,
-Please click on the following link to set your new password,Bitte auf die folgende Verknüpfung klicken um ein neues Passwort zu setzen,
 Please create <b>DATEV Settings</b> for Company <b>{}</b>.,Bitte erstellen Sie <b>DATEV-Einstellungen</b> für Firma <b>{}</b> .,
 Please create adjustment Journal Entry for amount {0} ,Bitte erstellen Sie eine Berichtigung für den Betrag {0}.,
 Please do not create more than 500 items at a time,Bitte erstellen Sie nicht mehr als 500 Artikel gleichzeitig,
@@ -3997,6 +3990,7 @@
 Release date must be in the future,Das Erscheinungsdatum muss in der Zukunft liegen,
 Relieving Date must be greater than or equal to Date of Joining,Das Ablösungsdatum muss größer oder gleich dem Beitrittsdatum sein,
 Rename,Umbenennen,
+Rename Not Allowed,Umbenennen nicht erlaubt,
 Repayment Method is mandatory for term loans,Die Rückzahlungsmethode ist für befristete Darlehen obligatorisch,
 Repayment Start Date is mandatory for term loans,Das Startdatum der Rückzahlung ist für befristete Darlehen obligatorisch,
 Report Item,Artikel melden,
@@ -4043,7 +4037,6 @@
 Select All,Alles auswählen,
 Select Difference Account,Wählen Sie Differenzkonto,
 Select a Default Priority.,Wählen Sie eine Standardpriorität.,
-Select a Supplier from the Default Supplier List of the items below.,Wählen Sie aus der Liste der Standardlieferanten einen Lieferanten aus.,
 Select a company,Wählen Sie eine Firma aus,
 Select finance book for the item {0} at row {1},Wählen Sie das Finanzbuch für das Element {0} in Zeile {1} aus.,
 Select only one Priority as Default.,Wählen Sie nur eine Priorität als Standard aus.,
@@ -4073,7 +4066,7 @@
 Show Warehouse-wise Stock,Lagerbestand anzeigen,
 Size,Größe,
 Something went wrong while evaluating the quiz.,Bei der Auswertung des Quiz ist ein Fehler aufgetreten.,
-Sr,Nr,
+Sr,Pos,
 Start,Start,
 Start Date cannot be before the current date,Startdatum darf nicht vor dem aktuellen Datum liegen,
 Start Time,Startzeit,
@@ -4209,7 +4202,7 @@
 Barcode,Barcode,
 Bold,Fett gedruckt,
 Center,Zentrieren,
-Clear,klar,
+Clear,Löschen,
 Comment,Kommentar,
 Comments,Kommentare,
 DocType,DocType,
@@ -4247,7 +4240,6 @@
 Actual ,Tatsächlich,
 Add to cart,In den Warenkorb legen,
 Budget,Budget,
-Chart Of Accounts Importer,Kontenplan-Importeur,
 Chart of Accounts,Kontenplan,
 Customer database.,Kundendatenbank.,
 Days Since Last order,Tage seit dem letzten Auftrag,
@@ -4546,7 +4538,6 @@
 Check Supplier Invoice Number Uniqueness,"Aktivieren, damit dieselbe Lieferantenrechnungsnummer nur einmal vorkommen kann",
 Make Payment via Journal Entry,Zahlung über Journaleintrag,
 Unlink Payment on Cancellation of Invoice,Zahlung bei Stornierung der Rechnung aufheben,
-Unlink Advance Payment on Cancelation of Order,Verknüpfung der Vorauszahlung bei Stornierung der Bestellung aufheben,
 Book Asset Depreciation Entry Automatically,Vermögensabschreibung automatisch verbuchen,
 Automatically Add Taxes and Charges from Item Tax Template,Steuern und Gebühren aus Artikelsteuervorlage automatisch hinzufügen,
 Automatically Fetch Payment Terms,Zahlungsbedingungen automatisch abrufen,
@@ -4940,7 +4931,6 @@
 POS Customer Group,POS Kundengruppe,
 POS Field,POS-Feld,
 POS Item Group,POS Artikelgruppe,
-[Select],[Auswählen],
 Company Address,Anschrift des Unternehmens,
 Update Stock,Lagerbestand aktualisieren,
 Ignore Pricing Rule,Preisregel ignorieren,
@@ -5048,7 +5038,7 @@
 Additional Discount,Zusätzlicher Rabatt,
 Apply Additional Discount On,Zusätzlichen Rabatt gewähren auf,
 Additional Discount Amount (Company Currency),Zusätzlicher Rabatt (Unternehmenswährung),
-Additional Discount Percentage,Zusätzlicher Rabattprozentsatz,
+Additional Discount Percentage,Zusätzlicher Rabatt in Prozent,
 Additional Discount Amount,Zusätzlicher Rabattbetrag,
 Grand Total (Company Currency),Gesamtbetrag (Unternehmenswährung),
 Rounding Adjustment (Company Currency),Rundung (Unternehmenswährung),
@@ -6481,7 +6471,6 @@
 Appraisal Template,Bewertungsvorlage,
 For Employee Name,Für Mitarbeiter-Name,
 Goals,Ziele,
-Calculate Total Score,Gesamtwertung berechnen,
 Total Score (Out of 5),Gesamtwertung (max 5),
 "Any other remarks, noteworthy effort that should go in the records.","Sonstige wichtige Anmerkungen, die in die Datensätze aufgenommen werden sollten.",
 Appraisal Goal,Bewertungsziel,
@@ -6599,11 +6588,6 @@
 Reason for Leaving,Grund für den Austritt,
 Leave Encashed?,Urlaub eingelöst?,
 Encashment Date,Inkassodatum,
-Exit Interview Details,Details zum Austrittsgespräch,
-Held On,Festgehalten am,
-Reason for Resignation,Kündigungsgrund,
-Better Prospects,Bessere Vorhersage,
-Health Concerns,Gesundheitsfragen,
 New Workplace,Neuer Arbeitsplatz,
 HR-EAD-.YYYY.-,HR-EAD-.YYYY.-,
 Returned Amount,Rückgabebetrag,
@@ -8239,9 +8223,6 @@
 Manufacturers used in Items,Hersteller im Artikel verwendet,
 Limited to 12 characters,Limitiert auf 12 Zeichen,
 MAT-MR-.YYYY.-,MAT-MR-.YYYY.-,
-Set Warehouse,Lager einstellen,
-Sets 'For Warehouse' in each row of the Items table.,Legt &#39;Für Lager&#39; in jeder Zeile der Artikeltabelle fest.,
-Requested For,Angefordert für,
 Partially Ordered,Teilweise bestellt,
 Transferred,Übergeben,
 % Ordered,% bestellt,
@@ -8690,8 +8671,6 @@
 Select warehouse for material requests,Wählen Sie Lager für Materialanfragen,
 Transfer Materials For Warehouse {0},Material für Lager übertragen {0},
 Production Plan Material Request Warehouse,Produktionsplan Materialanforderungslager,
-Set From Warehouse,Aus dem Lager einstellen,
-Source Warehouse (Material Transfer),Quelllager (Materialtransfer),
 Sets 'Source Warehouse' in each row of the items table.,Legt &#39;Source Warehouse&#39; in jeder Zeile der Artikeltabelle fest.,
 Sets 'Target Warehouse' in each row of the items table.,"Füllt das Feld ""Ziel Lager"" in allen Positionen der folgenden Tabelle.",
 Show Cancelled Entries,Abgebrochene Einträge anzeigen,
@@ -9157,7 +9136,6 @@
 Is Income Tax Component,Ist Einkommensteuerkomponente,
 Component properties and references ,Komponenteneigenschaften und Referenzen,
 Additional Salary ,Zusätzliches Gehalt,
-Condtion and formula,Zustand und Formel,
 Unmarked days,Nicht markierte Tage,
 Absent Days,Abwesende Tage,
 Conditions and Formula variable and example,Bedingungen und Formelvariable und Beispiel,
@@ -9444,7 +9422,6 @@
 Please check your Plaid client ID and secret values,Bitte überprüfen Sie Ihre Plaid-Client-ID und Ihre geheimen Werte,
 Bank transaction creation error,Fehler beim Erstellen der Banküberweisung,
 Unit of Measurement,Maßeinheit,
-Row #{}: Selling rate for item {} is lower than its {}. Selling rate should be atleast {},Zeile # {}: Die Verkaufsrate für Artikel {} ist niedriger als die {}. Die Verkaufsrate sollte mindestens {} betragen,
 Fiscal Year {0} Does Not Exist,Geschäftsjahr {0} existiert nicht,
 Row # {0}: Returned Item {1} does not exist in {2} {3},Zeile # {0}: Zurückgegebenes Element {1} ist in {2} {3} nicht vorhanden,
 Valuation type charges can not be marked as Inclusive,Bewertungsgebühren können nicht als Inklusiv gekennzeichnet werden,
@@ -9598,8 +9575,60 @@
 Response Time for {0} priority in row {1} can't be greater than Resolution Time.,Die Antwortzeit für die Priorität {0} in Zeile {1} darf nicht größer als die Auflösungszeit sein.,
 {0} is not enabled in {1},{0} ist in {1} nicht aktiviert,
 Group by Material Request,Nach Materialanforderung gruppieren,
-"Row {0}: For Supplier {0}, Email Address is Required to Send Email",Zeile {0}: Für Lieferant {0} ist zum Senden von E-Mails eine E-Mail-Adresse erforderlich,
 Email Sent to Supplier {0},E-Mail an Lieferanten gesendet {0},
 "The Access to Request for Quotation From Portal is Disabled. To Allow Access, Enable it in Portal Settings.","Der Zugriff auf die Angebotsanfrage vom Portal ist deaktiviert. Um den Zugriff zuzulassen, aktivieren Sie ihn in den Portaleinstellungen.",
 Supplier Quotation {0} Created,Lieferantenangebot {0} Erstellt,
 Valid till Date cannot be before Transaction Date,Gültig bis Datum kann nicht vor dem Transaktionsdatum liegen,
+Unlink Advance Payment on Cancellation of Order,Deaktivieren Sie die Vorauszahlung bei Stornierung der Bestellung,
+"Simple Python Expression, Example: territory != 'All Territories'","Einfacher Python-Ausdruck, Beispiel: Territorium! = &#39;Alle Territorien&#39;",
+Sales Contributions and Incentives,Verkaufsbeiträge und Anreize,
+Sourced by Supplier,Vom Lieferanten bezogen,
+Total weightage assigned should be 100%.<br>It is {0},Das zugewiesene Gesamtgewicht sollte 100% betragen.<br> Es ist {0},
+Account {0} exists in parent company {1}.,Konto {0} existiert in der Muttergesellschaft {1}.,
+"To overrule this, enable '{0}' in company {1}","Um dies zu überschreiben, aktivieren Sie &#39;{0}&#39; in Firma {1}",
+Invalid condition expression,Ungültiger Bedingungsausdruck,
+Please Select a Company First,Bitte wählen Sie zuerst eine Firma aus,
+Please Select Both Company and Party Type First,Bitte wählen Sie zuerst Firmen- und Partytyp aus,
+Provide the invoice portion in percent,Geben Sie den Rechnungsanteil in Prozent an,
+Give number of days according to prior selection,Geben Sie die Anzahl der Tage gemäß vorheriger Auswahl an,
+Email Details,E-Mail-Details,
+"Select a greeting for the receiver. E.g. Mr., Ms., etc.","Wählen Sie eine Begrüßung für den Empfänger. ZB Herr, Frau usw.",
+Preview Email,Vorschau E-Mail,
+Please select a Supplier,Bitte wählen Sie einen Lieferanten aus,
+Supplier Lead Time (days),Vorlaufzeit des Lieferanten (Tage),
+"Home, Work, etc.","Zuhause, Arbeit usw.",
+Exit Interview Held On,Beenden Sie das Interview,
+Condition and formula,Zustand und Formel,
+Sets 'Target Warehouse' in each row of the Items table.,Legt &#39;Ziellager&#39; in jeder Zeile der Elementtabelle fest.,
+Sets 'Source Warehouse' in each row of the Items table.,Legt &#39;Source Warehouse&#39; in jeder Zeile der Items-Tabelle fest.,
+POS Register,POS-Register,
+"Can not filter based on POS Profile, if grouped by POS Profile","Kann nicht basierend auf dem POS-Profil filtern, wenn nach POS-Profil gruppiert",
+"Can not filter based on Customer, if grouped by Customer","Kann nicht nach Kunden filtern, wenn nach Kunden gruppiert",
+"Can not filter based on Cashier, if grouped by Cashier","Kann nicht nach Kassierer filtern, wenn nach Kassierer gruppiert",
+Payment Method,Zahlungsmethode,
+"Can not filter based on Payment Method, if grouped by Payment Method","Kann nicht nach Zahlungsmethode filtern, wenn nach Zahlungsmethode gruppiert",
+Supplier Quotation Comparison,Vergleich der Lieferantenangebote,
+Price per Unit (Stock UOM),Preis pro Einheit (Lager UOM),
+Group by Supplier,Nach Lieferanten gruppieren,
+Group by Item,Nach Artikel gruppieren,
+Remember to set {field_label}. It is required by {regulation}.,"Denken Sie daran, {field_label} zu setzen. Es wird von {Regulation} verlangt.",
+Enrollment Date cannot be before the Start Date of the Academic Year {0},Das Einschreibedatum darf nicht vor dem Startdatum des akademischen Jahres liegen {0},
+Enrollment Date cannot be after the End Date of the Academic Term {0},Das Einschreibungsdatum darf nicht nach dem Enddatum des akademischen Semesters liegen {0},
+Enrollment Date cannot be before the Start Date of the Academic Term {0},Das Einschreibungsdatum darf nicht vor dem Startdatum des akademischen Semesters liegen {0},
+Posting future transactions are not allowed due to Immutable Ledger,Das Buchen zukünftiger Transaktionen ist aufgrund des unveränderlichen Hauptbuchs nicht zulässig,
+Future Posting Not Allowed,Zukünftiges Posten nicht erlaubt,
+"To enable Capital Work in Progress Accounting, ",So aktivieren Sie die Kapitalabrechnung,
+you must select Capital Work in Progress Account in accounts table,Sie müssen in der Kontentabelle das Konto &quot;Kapital in Bearbeitung&quot; auswählen,
+You can also set default CWIP account in Company {},Sie können auch das Standard-CWIP-Konto in Firma {} festlegen,
+The Request for Quotation can be accessed by clicking on the following button,"Sie können auf die Angebotsanfrage zugreifen, indem Sie auf die folgende Schaltfläche klicken",
+Regards,Grüße,
+Please click on the following button to set your new password,"Bitte klicken Sie auf die folgende Schaltfläche, um Ihr neues Passwort festzulegen",
+Update Password,Passwort erneuern,
+Row #{}: Selling rate for item {} is lower than its {}. Selling {} should be atleast {},Zeile # {}: Die Verkaufsrate für Artikel {} ist niedriger als die {}. Der Verkauf von {} sollte mindestens {} sein,
+You can alternatively disable selling price validation in {} to bypass this validation.,"Alternativ können Sie die Validierung des Verkaufspreises in {} deaktivieren, um diese Validierung zu umgehen.",
+Invalid Selling Price,Ungültiger Verkaufspreis,
+Address needs to be linked to a Company. Please add a row for Company in the Links table.,Die Adresse muss mit einem Unternehmen verknüpft sein. Bitte fügen Sie eine Zeile für Firma in die Tabelle Links ein.,
+Company Not Linked,Firma nicht verbunden,
+Import Chart of Accounts from CSV / Excel files,Kontenplan aus CSV / Excel-Dateien importieren,
+Completed Qty cannot be greater than 'Qty to Manufacture',Die abgeschlossene Menge darf nicht größer sein als die Menge bis zur Herstellung.,
+"Row {0}: For Supplier {1}, Email Address is Required to send an email","Zeile {0}: Für Lieferant {1} ist eine E-Mail-Adresse erforderlich, um eine E-Mail zu senden",
diff --git a/erpnext/translations/el.csv b/erpnext/translations/el.csv
index ec5a1be..b5342f1 100644
--- a/erpnext/translations/el.csv
+++ b/erpnext/translations/el.csv
@@ -521,7 +521,6 @@
 Chargeble,Χρεώσιμο,
 Charges are updated in Purchase Receipt against each item,Οι επιβαρύνσεις ενημερώνονται στην απόδειξη αγοράς για κάθε είδος,
 "Charges will be distributed proportionately based on item qty or amount, as per your selection","Οι επιβαρύνσεις θα κατανεμηθούν αναλογικά, σύμφωνα με την ποσότητα ή το ποσό του είδους, σύμφωνα με την επιλογή σας",
-Chart Of Accounts,Λογιστικό Σχέδιο,
 Chart of Cost Centers,Διάγραμμα των κέντρων κόστους,
 Check all,Ελεγξε τα ολα,
 Checkout,Αποχώρηση,
@@ -581,7 +580,6 @@
 Compensatory Off,Αντισταθμιστικά απενεργοποιημένα,
 Compensatory leave request days not in valid holidays,Οι ημερήσιες αποζημιώσεις αντιστάθμισης δεν ισχύουν σε έγκυρες αργίες,
 Complaint,Καταγγελία,
-Completed Qty can not be greater than 'Qty to Manufacture',Η ολοκληρωμένη ποσότητα δεν μπορεί να είναι μεγαλύτερη από την «ποσότητα για κατασκευή»,
 Completion Date,Ημερομηνία ολοκλήρωσης,
 Computer,Ηλεκτρονικός υπολογιστής,
 Condition,Συνθήκη,
@@ -2033,7 +2031,6 @@
 Please select Charge Type first,Παρακαλώ επιλέξτε πρώτα τύπο επιβάρυνσης,
 Please select Company,Επιλέξτε Εταιρεία,
 Please select Company and Designation,Επιλέξτε Εταιρεία και ονομασία,
-Please select Company and Party Type first,Παρακαλώ επιλέξτε πρώτα εταιρεία και τύπο συμβαλλόμενου,
 Please select Company and Posting Date to getting entries,Επιλέξτε Εταιρεία και ημερομηνία δημοσίευσης για να λάβετε καταχωρήσεις,
 Please select Company first,Επιλέξτε την εταιρεία πρώτα,
 Please select Completion Date for Completed Asset Maintenance Log,Παρακαλούμε επιλέξτε Ημερομηνία ολοκλήρωσης για το αρχείο καταγραφής ολοκλήρωσης περιουσιακών στοιχείων,
@@ -2980,7 +2977,6 @@
 The name of your company for which you are setting up this system.,Το όνομα της εταιρείας σας για την οποία εγκαθιστάτε αυτό το σύστημα.,
 The number of shares and the share numbers are inconsistent,Ο αριθμός των μετοχών και οι αριθμοί μετοχών είναι ασυμβίβαστοι,
 The payment gateway account in plan {0} is different from the payment gateway account in this payment request,Ο λογαριασμός πύλης πληρωμής στο πρόγραμμα {0} διαφέρει από τον λογαριασμό της πύλης πληρωμής σε αυτό το αίτημα πληρωμής,
-The request for quotation can be accessed by clicking on the following link,Το αίτημα για προσφορά μπορεί να προσπελαστεί κάνοντας κλικ στον παρακάτω σύνδεσμο,
 The selected BOMs are not for the same item,Τα επιλεγμένα BOMs δεν είναι για το ίδιο στοιχείο,
 The selected item cannot have Batch,Το επιλεγμένο είδος δεν μπορεί να έχει παρτίδα,
 The seller and the buyer cannot be the same,Ο πωλητής και ο αγοραστής δεν μπορούν να είναι οι ίδιοι,
@@ -3130,7 +3126,6 @@
 Total flexible benefit component amount {0} should not be less than max benefits {1},Το συνολικό ποσό της ευέλικτης συνιστώσας παροχών {0} δεν πρέπει να είναι μικρότερο από τα μέγιστα οφέλη {1},
 Total hours: {0},Σύνολο ωρών: {0},
 Total leaves allocated is mandatory for Leave Type {0},Το σύνολο των κατανεμημένων φύλλων είναι υποχρεωτικό για τον Τύπο Αδείας {0},
-Total weightage assigned should be 100%. It is {0},Το σύνολο βάρους πού έχει ανατεθεί έπρεπε να είναι 100 %. Είναι {0},
 Total working hours should not be greater than max working hours {0},Οι συνολικές ώρες εργασίας δεν πρέπει να είναι μεγαλύτερη από το ωράριο εργασίας max {0},
 Total {0} ({1}),Σύνολο {0} ({1}),
 "Total {0} for all items is zero, may be you should change 'Distribute Charges Based On'","Σύνολο {0} για όλα τα στοιχεία είναι μηδέν, μπορεί να πρέπει να αλλάξει »Μοιράστε τελών με βάση το &#39;",
@@ -3544,7 +3539,6 @@
 Company field is required,Απαιτείται πεδίο εταιρείας,
 Creating Dimensions...,Δημιουργία διαστάσεων ...,
 Duplicate entry against the item code {0} and manufacturer {1},Διπλότυπη καταχώρηση έναντι του κωδικού {0} και του κατασκευαστή {1},
-Import Chart Of Accounts from CSV / Excel files,Εισαγωγή πίνακα λογαριασμών από αρχεία CSV / Excel,
 Invalid GSTIN! The input you've entered doesn't match the GSTIN format for UIN Holders or Non-Resident OIDAR Service Providers,Μη έγκυρο GSTIN! Η είσοδος που έχετε εισάγει δεν αντιστοιχεί στη μορφή GSTIN για τους κατόχους UIN ή για τους παροχείς υπηρεσιών OIDAR που δεν είναι κατοίκους,
 Invoice Grand Total,Συνολικό τιμολόγιο,
 Last carbon check date cannot be a future date,Η τελευταία ημερομηνία ελέγχου άνθρακα δεν μπορεί να είναι μελλοντική ημερομηνία,
@@ -3921,7 +3915,6 @@
 Plaid public token error,Σφάλμα κοινόχρηστου συμβόλου,
 Plaid transactions sync error,Σφάλμα συγχρονισμού πλαστών συναλλαγών,
 Please check the error log for details about the import errors,Ελέγξτε το αρχείο καταγραφής σφαλμάτων για λεπτομέρειες σχετικά με τα σφάλματα εισαγωγής,
-Please click on the following link to set your new password,Παρακαλώ κάντε κλικ στον παρακάτω σύνδεσμο για να ορίσετε νέο κωδικό πρόσβασης,
 Please create <b>DATEV Settings</b> for Company <b>{}</b>.,Δημιουργήστε τις <b>ρυθμίσεις DATEV</b> για την εταιρεία <b>{}</b> .,
 Please create adjustment Journal Entry for amount {0} ,Δημιουργήστε εγγραφή εγγραφής προσαρμογής για ποσό {0},
 Please do not create more than 500 items at a time,Μην δημιουργείτε περισσότερα από 500 στοιχεία τη φορά,
@@ -3997,6 +3990,7 @@
 Release date must be in the future,Η ημερομηνία κυκλοφορίας πρέπει να είναι στο μέλλον,
 Relieving Date must be greater than or equal to Date of Joining,Η ημερομηνία ανακούφισης πρέπει να είναι μεγαλύτερη ή ίση με την Ημερομηνία Σύνδεσης,
 Rename,Μετονομασία,
+Rename Not Allowed,Μετονομασία Δεν επιτρέπεται,
 Repayment Method is mandatory for term loans,Η μέθοδος αποπληρωμής είναι υποχρεωτική για δάνεια με διάρκεια,
 Repayment Start Date is mandatory for term loans,Η ημερομηνία έναρξης αποπληρωμής είναι υποχρεωτική για τα δάνεια με διάρκεια,
 Report Item,Στοιχείο αναφοράς,
@@ -4043,7 +4037,6 @@
 Select All,Επιλέξτε All,
 Select Difference Account,Επιλέξτε Λογαριασμό Διαφοράς,
 Select a Default Priority.,Επιλέξτε μια προεπιλεγμένη προτεραιότητα.,
-Select a Supplier from the Default Supplier List of the items below.,Επιλέξτε έναν προμηθευτή από την Προκαθορισμένη λίστα προμηθευτών των παρακάτω στοιχείων.,
 Select a company,Επιλέξτε μια εταιρεία,
 Select finance book for the item {0} at row {1},Επιλέξτε βιβλίο χρηματοδότησης για το στοιχείο {0} στη σειρά {1},
 Select only one Priority as Default.,Επιλέξτε μόνο μία προτεραιότητα ως προεπιλογή.,
@@ -4247,7 +4240,6 @@
 Actual ,Πραγματικός,
 Add to cart,Προσθήκη στο καλάθι,
 Budget,Προϋπολογισμός,
-Chart Of Accounts Importer,Λογαριασμός Εισαγωγέας,
 Chart of Accounts,Λογιστικό Σχέδιο,
 Customer database.,Βάση δεδομένων πελατών.,
 Days Since Last order,Ημέρες από την τελευταία σειρά,
@@ -4546,7 +4538,6 @@
 Check Supplier Invoice Number Uniqueness,Ελέγξτε Προμηθευτής Αριθμός Τιμολογίου Μοναδικότητα,
 Make Payment via Journal Entry,Κάντε Πληρωμή μέσω Εφημερίδα Έναρξη,
 Unlink Payment on Cancellation of Invoice,Αποσύνδεση Πληρωμή κατά την ακύρωσης της Τιμολόγιο,
-Unlink Advance Payment on Cancelation of Order,Αποσύνδεση της προκαταβολής με την ακύρωση της παραγγελίας,
 Book Asset Depreciation Entry Automatically,Αποσβέσεις εγγύησης λογαριασμού βιβλίων αυτόματα,
 Automatically Add Taxes and Charges from Item Tax Template,Αυτόματη προσθήκη φόρων και χρεώσεων από το πρότυπο φόρου αντικειμένων,
 Automatically Fetch Payment Terms,Αυτόματη εξαγωγή όρων πληρωμής,
@@ -4940,7 +4931,6 @@
 POS Customer Group,POS Ομάδα Πελατών,
 POS Field,Πεδίο POS,
 POS Item Group,POS Θέση του Ομίλου,
-[Select],[ Επιλέξτε ],
 Company Address,Διεύθυνση εταιρείας,
 Update Stock,Ενημέρωση αποθέματος,
 Ignore Pricing Rule,Αγνοήστε τον κανόνα τιμολόγησης,
@@ -6481,7 +6471,6 @@
 Appraisal Template,Πρότυπο αξιολόγησης,
 For Employee Name,Για το όνομα υπαλλήλου,
 Goals,Στόχοι,
-Calculate Total Score,Υπολογισμός συνολικής βαθμολογίας,
 Total Score (Out of 5),Συνολική βαθμολογία (από 5),
 "Any other remarks, noteworthy effort that should go in the records.","Οποιεσδήποτε άλλες παρατηρήσεις, αξιοσημείωτη προσπάθεια που πρέπει να πάει στα αρχεία.",
 Appraisal Goal,Στόχος αξιολόγησης,
@@ -6599,11 +6588,6 @@
 Reason for Leaving,Αιτιολογία αποχώρησης,
 Leave Encashed?,Η άδεια εισπράχθηκε;,
 Encashment Date,Ημερομηνία εξαργύρωσης,
-Exit Interview Details,Λεπτομέρειες συνέντευξης εξόδου,
-Held On,Πραγματοποιήθηκε την,
-Reason for Resignation,Αιτία παραίτησης,
-Better Prospects,Καλύτερες προοπτικές,
-Health Concerns,Ανησυχίες για την υγεία,
 New Workplace,Νέος χώρος εργασίας,
 HR-EAD-.YYYY.-,HR-EAD-.YYYY.-,
 Returned Amount,Επιστρεφόμενο ποσό,
@@ -8239,9 +8223,6 @@
 Manufacturers used in Items,Κατασκευαστές που χρησιμοποιούνται στα σημεία,
 Limited to 12 characters,Περιορίζεται σε 12 χαρακτήρες,
 MAT-MR-.YYYY.-,MAT-MR-.YYYY.-,
-Set Warehouse,Ορισμός αποθήκης,
-Sets 'For Warehouse' in each row of the Items table.,Ορίζει «Για αποθήκη» σε κάθε σειρά του πίνακα αντικειμένων.,
-Requested For,Ζητήθηκαν για,
 Partially Ordered,Εν μέρει παραγγελία,
 Transferred,Μεταφέρθηκε,
 % Ordered,% Παραγγέλθηκαν,
@@ -8690,8 +8671,6 @@
 Select warehouse for material requests,Επιλέξτε αποθήκη για αιτήματα υλικών,
 Transfer Materials For Warehouse {0},Μεταφορά υλικών για αποθήκη {0},
 Production Plan Material Request Warehouse,Πρόγραμμα παραγωγής Υλικό Αίτημα Αποθήκη,
-Set From Warehouse,Ορισμός από την αποθήκη,
-Source Warehouse (Material Transfer),Αποθήκη πηγής (μεταφορά υλικού),
 Sets 'Source Warehouse' in each row of the items table.,Ορίζει το &quot;Source Warehouse&quot; σε κάθε σειρά του πίνακα αντικειμένων.,
 Sets 'Target Warehouse' in each row of the items table.,Ορίζει το «Target Warehouse» σε κάθε σειρά του πίνακα αντικειμένων.,
 Show Cancelled Entries,Εμφάνιση ακυρωμένων καταχωρήσεων,
@@ -9157,7 +9136,6 @@
 Is Income Tax Component,Είναι συστατικό φόρου εισοδήματος,
 Component properties and references ,Ιδιότητες συστατικών και αναφορές,
 Additional Salary ,Πρόσθετος μισθός,
-Condtion and formula,Κατάσταση και τύπος,
 Unmarked days,Ημέρες χωρίς σήμανση,
 Absent Days,Απόντες ημέρες,
 Conditions and Formula variable and example,Συνθήκες και μεταβλητή τύπου και παράδειγμα,
@@ -9444,7 +9422,6 @@
 Please check your Plaid client ID and secret values,Ελέγξτε το αναγνωριστικό πελάτη Plaid και τις μυστικές τιμές σας,
 Bank transaction creation error,Σφάλμα δημιουργίας τραπεζικής συναλλαγής,
 Unit of Measurement,Μονάδα μέτρησης,
-Row #{}: Selling rate for item {} is lower than its {}. Selling rate should be atleast {},Σειρά # {}: Το ποσοστό πώλησης για το στοιχείο {} είναι χαμηλότερο από το {}. Η τιμή πώλησης πρέπει να είναι τουλάχιστον {},
 Fiscal Year {0} Does Not Exist,Το οικονομικό έτος {0} δεν υπάρχει,
 Row # {0}: Returned Item {1} does not exist in {2} {3},Σειρά # {0}: Το στοιχείο που επιστράφηκε {1} δεν υπάρχει στο {2} {3},
 Valuation type charges can not be marked as Inclusive,Οι χρεώσεις τύπου εκτίμησης δεν μπορούν να επισημανθούν ως Συμπεριλαμβανομένων,
@@ -9598,8 +9575,60 @@
 Response Time for {0} priority in row {1} can't be greater than Resolution Time.,Ο χρόνος απόκρισης για {0} προτεραιότητα στη σειρά {1} δεν μπορεί να είναι μεγαλύτερος από τον χρόνο ανάλυσης.,
 {0} is not enabled in {1},Το {0} δεν είναι ενεργοποιημένο σε {1},
 Group by Material Request,Ομαδοποίηση κατά Αίτημα Υλικού,
-"Row {0}: For Supplier {0}, Email Address is Required to Send Email","Σειρά {0}: Για τον προμηθευτή {0}, απαιτείται διεύθυνση ηλεκτρονικού ταχυδρομείου για αποστολή email",
 Email Sent to Supplier {0},Αποστολή email στον προμηθευτή {0},
 "The Access to Request for Quotation From Portal is Disabled. To Allow Access, Enable it in Portal Settings.","Η πρόσβαση στο αίτημα για προσφορά από την πύλη είναι απενεργοποιημένη. Για να επιτρέψετε την πρόσβαση, ενεργοποιήστε το στις Ρυθμίσεις πύλης.",
 Supplier Quotation {0} Created,Προσφορά προμηθευτή {0} Δημιουργήθηκε,
 Valid till Date cannot be before Transaction Date,Ισχύει έως την ημερομηνία δεν μπορεί να είναι πριν από την ημερομηνία συναλλαγής,
+Unlink Advance Payment on Cancellation of Order,Αποσύνδεση προκαταβολής για ακύρωση παραγγελίας,
+"Simple Python Expression, Example: territory != 'All Territories'","Simple Python Expression, Παράδειγμα: wilayah! = &#39;Όλες οι περιοχές&#39;",
+Sales Contributions and Incentives,Συνεισφορές και κίνητρα πωλήσεων,
+Sourced by Supplier,Προέρχεται από τον προμηθευτή,
+Total weightage assigned should be 100%.<br>It is {0},Το συνολικό βάρος που αποδίδεται πρέπει να είναι 100%.<br> Είναι {0},
+Account {0} exists in parent company {1}.,Ο λογαριασμός {0} υπάρχει στη μητρική εταιρεία {1}.,
+"To overrule this, enable '{0}' in company {1}","Για να το παρακάμψετε, ενεργοποιήστε το &quot;{0}&quot; στην εταιρεία {1}",
+Invalid condition expression,Μη έγκυρη έκφραση συνθήκης,
+Please Select a Company First,Επιλέξτε πρώτα μια εταιρεία,
+Please Select Both Company and Party Type First,Επιλέξτε πρώτα την εταιρεία και τον τύπο πάρτι,
+Provide the invoice portion in percent,Καταχωρίστε το τμήμα τιμολογίου σε ποσοστό,
+Give number of days according to prior selection,Δώστε τον αριθμό των ημερών σύμφωνα με την προηγούμενη επιλογή,
+Email Details,Λεπτομέρειες email,
+"Select a greeting for the receiver. E.g. Mr., Ms., etc.","Επιλέξτε ένα χαιρετισμό για τον παραλήπτη. Π.χ. κύριε, κυρία κ.λπ.",
+Preview Email,Προεπισκόπηση email,
+Please select a Supplier,Επιλέξτε έναν προμηθευτή,
+Supplier Lead Time (days),Χρόνος προμηθευτή (ημέρες),
+"Home, Work, etc.","Σπίτι, εργασία κ.λπ.",
+Exit Interview Held On,Έξοδος από τη συνέντευξη,
+Condition and formula,Κατάσταση και τύπος,
+Sets 'Target Warehouse' in each row of the Items table.,Ορίζει το «Target Warehouse» σε κάθε σειρά του πίνακα αντικειμένων.,
+Sets 'Source Warehouse' in each row of the Items table.,Ορίζει το &quot;Source Warehouse&quot; σε κάθε σειρά του πίνακα αντικειμένων.,
+POS Register,Εγγραφή POS,
+"Can not filter based on POS Profile, if grouped by POS Profile","Δεν είναι δυνατή η φιλτράρισμα με βάση το προφίλ POS, εάν ομαδοποιούνται βάσει προφίλ POS",
+"Can not filter based on Customer, if grouped by Customer","Δεν είναι δυνατή η φιλτράρισμα με βάση τον πελάτη, εάν ομαδοποιούνται ανά πελάτη",
+"Can not filter based on Cashier, if grouped by Cashier","Δεν είναι δυνατή η φιλτράρισμα βάσει Ταμείου, εάν ομαδοποιούνται κατά Ταμείο",
+Payment Method,Μέθοδος πληρωμής,
+"Can not filter based on Payment Method, if grouped by Payment Method","Δεν είναι δυνατή η φιλτράρισμα βάσει της μεθόδου πληρωμής, εάν ομαδοποιούνται βάσει της μεθόδου πληρωμής",
+Supplier Quotation Comparison,Σύγκριση προσφορών προμηθευτή,
+Price per Unit (Stock UOM),Τιμή ανά μονάδα (απόθεμα UOM),
+Group by Supplier,Ομαδοποίηση ανά προμηθευτή,
+Group by Item,Ομαδοποίηση ανά αντικείμενο,
+Remember to set {field_label}. It is required by {regulation}.,Θυμηθείτε να ορίσετε το {field_label}. Απαιτείται από τον {κανονισμό}.,
+Enrollment Date cannot be before the Start Date of the Academic Year {0},Η ημερομηνία εγγραφής δεν μπορεί να είναι πριν από την ημερομηνία έναρξης του ακαδημαϊκού έτους {0},
+Enrollment Date cannot be after the End Date of the Academic Term {0},Η ημερομηνία εγγραφής δεν μπορεί να είναι μετά την ημερομηνία λήξης του ακαδημαϊκού όρου {0},
+Enrollment Date cannot be before the Start Date of the Academic Term {0},Η ημερομηνία εγγραφής δεν μπορεί να είναι πριν από την ημερομηνία έναρξης του ακαδημαϊκού όρου {0},
+Posting future transactions are not allowed due to Immutable Ledger,Δεν επιτρέπεται η δημοσίευση μελλοντικών συναλλαγών λόγω του αμετάβλητου καθολικού,
+Future Posting Not Allowed,Δεν επιτρέπονται μελλοντικές δημοσιεύσεις,
+"To enable Capital Work in Progress Accounting, ","Για να ενεργοποιήσετε το Capital Work in Progress Accounting,",
+you must select Capital Work in Progress Account in accounts table,Πρέπει να επιλέξετε τον πίνακα Capital Work in Progress Account στον πίνακα λογαριασμών,
+You can also set default CWIP account in Company {},Μπορείτε επίσης να ορίσετε προεπιλεγμένο λογαριασμό CWIP στην Εταιρεία {},
+The Request for Quotation can be accessed by clicking on the following button,Μπορείτε να αποκτήσετε πρόσβαση στην Αίτηση Προσφοράς κάνοντας κλικ στο παρακάτω κουμπί,
+Regards,Χαιρετισμοί,
+Please click on the following button to set your new password,Κάντε κλικ στο παρακάτω κουμπί για να ορίσετε τον νέο σας κωδικό πρόσβασης,
+Update Password,Ενημέρωση κωδικού πρόσβασης,
+Row #{}: Selling rate for item {} is lower than its {}. Selling {} should be atleast {},Σειρά # {}: Το ποσοστό πώλησης για το στοιχείο {} είναι χαμηλότερο από το {}. Η πώληση {} πρέπει να είναι τουλάχιστον {},
+You can alternatively disable selling price validation in {} to bypass this validation.,"Εναλλακτικά, μπορείτε να απενεργοποιήσετε την επικύρωση τιμής πώλησης στο {} για να παρακάμψετε αυτήν την επικύρωση.",
+Invalid Selling Price,Μη έγκυρη τιμή πώλησης,
+Address needs to be linked to a Company. Please add a row for Company in the Links table.,Η διεύθυνση πρέπει να συνδεθεί με μια εταιρεία. Προσθέστε μια σειρά για την εταιρεία στον πίνακα &quot;Σύνδεσμοι&quot;.,
+Company Not Linked,Η εταιρεία δεν είναι συνδεδεμένη,
+Import Chart of Accounts from CSV / Excel files,Εισαγωγή γραφήματος λογαριασμών από αρχεία CSV / Excel,
+Completed Qty cannot be greater than 'Qty to Manufacture',Το ολοκληρωμένο Qty δεν μπορεί να είναι μεγαλύτερο από το &quot;Qty to Manufacture&quot;,
+"Row {0}: For Supplier {1}, Email Address is Required to send an email","Σειρά {0}: Για τον προμηθευτή {1}, απαιτείται διεύθυνση ηλεκτρονικού ταχυδρομείου για την αποστολή email",
diff --git a/erpnext/translations/es.csv b/erpnext/translations/es.csv
index 08b3900..0b2c302 100644
--- a/erpnext/translations/es.csv
+++ b/erpnext/translations/es.csv
@@ -521,7 +521,6 @@
 Chargeble,Cobrable,
 Charges are updated in Purchase Receipt against each item,Los cargos se actualizan en el recibo de compra  por cada producto,
 "Charges will be distributed proportionately based on item qty or amount, as per your selection","Los cargos se distribuirán proporcionalmente basados en la cantidad o importe, según selección",
-Chart Of Accounts,Plan de cuentas,
 Chart of Cost Centers,Centros de costos,
 Check all,Marcar todas,
 Checkout,Pedido,
@@ -581,7 +580,6 @@
 Compensatory Off,Compensatorio,
 Compensatory leave request days not in valid holidays,Días de solicitud de permiso compensatorio no en días feriados válidos,
 Complaint,Queja,
-Completed Qty can not be greater than 'Qty to Manufacture',La cantidad completada no puede ser mayor que la cantidad a manufacturar.,
 Completion Date,Fecha de  finalización,
 Computer,Computadora,
 Condition,Condición,
@@ -2033,7 +2031,6 @@
 Please select Charge Type first,"Por favor, seleccione primero el tipo de cargo",
 Please select Company,"Por favor, seleccione la empresa",
 Please select Company and Designation,Seleccione Compañía y Designación,
-Please select Company and Party Type first,"Por favor, seleccione la compañía y el tipo de entidad",
 Please select Company and Posting Date to getting entries,Seleccione Empresa y Fecha de publicación para obtener entradas,
 Please select Company first,"Por favor, seleccione primero la compañía",
 Please select Completion Date for Completed Asset Maintenance Log,Seleccione Fecha de Finalización para el Registro de Mantenimiento de Activos Completado,
@@ -2980,7 +2977,6 @@
 The name of your company for which you are setting up this system.,Ingrese el nombre de la compañía para configurar el sistema.,
 The number of shares and the share numbers are inconsistent,El número de acciones y el número de acciones son inconsistentes,
 The payment gateway account in plan {0} is different from the payment gateway account in this payment request,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,
-The request for quotation can be accessed by clicking on the following link,La solicitud de cotización se puede acceder haciendo clic en el siguiente enlace,
 The selected BOMs are not for the same item,Las listas de materiales seleccionados no son para el mismo artículo,
 The selected item cannot have Batch,El producto seleccionado no puede contener lotes,
 The seller and the buyer cannot be the same,El vendedor y el comprador no pueden ser el mismo,
@@ -3130,7 +3126,6 @@
 Total flexible benefit component amount {0} should not be less than max benefits {1},El monto total del componente de beneficio flexible {0} no debe ser inferior al beneficio máximo {1},
 Total hours: {0},Horas totales: {0},
 Total leaves allocated is mandatory for Leave Type {0},Las Licencias totales asignadas son obligatorias para el Tipo de Licencia {0},
-Total weightage assigned should be 100%. It is {0},Peso total asignado debe ser de 100 %. Es {0},
 Total working hours should not be greater than max working hours {0},Total de horas de trabajo no deben ser mayores que las horas de trabajo max {0},
 Total {0} ({1}),Total {0} ({1}),
 "Total {0} for all items is zero, may be you should change 'Distribute Charges Based On'","Total de {0} para todos los elementos es cero, puede ser que usted debe cambiar en &quot;Distribuir los cargos basados en &#39;",
@@ -3544,7 +3539,6 @@
 Company field is required,Campo de la empresa es obligatorio,
 Creating Dimensions...,Creando Dimensiones ...,
 Duplicate entry against the item code {0} and manufacturer {1},Entrada duplicada contra el código de artículo {0} y el fabricante {1},
-Import Chart Of Accounts from CSV / Excel files,Importar plan de cuentas de archivos CSV / Excel,
 Invalid GSTIN! The input you've entered doesn't match the GSTIN format for UIN Holders or Non-Resident OIDAR Service Providers,GSTIN inválido! La entrada que ingresó no coincide con el formato GSTIN para titulares de UIN o proveedores de servicios OIDAR no residentes,
 Invoice Grand Total,Factura Gran Total,
 Last carbon check date cannot be a future date,La última fecha de verificación de carbono no puede ser una fecha futura,
@@ -3921,7 +3915,6 @@
 Plaid public token error,Error de token público a cuadros,
 Plaid transactions sync error,Error de sincronización de transacciones a cuadros,
 Please check the error log for details about the import errors,Consulte el registro de errores para obtener detalles sobre los errores de importación.,
-Please click on the following link to set your new password,"Por favor, haga clic en el siguiente enlace para configurar su nueva contraseña",
 Please create <b>DATEV Settings</b> for Company <b>{}</b>.,<b>Cree la configuración de DATEV</b> para la empresa <b>{}</b> .,
 Please create adjustment Journal Entry for amount {0} ,Cree una entrada de diario de ajuste para la cantidad {0},
 Please do not create more than 500 items at a time,No cree más de 500 artículos a la vez.,
@@ -3997,6 +3990,7 @@
 Release date must be in the future,La fecha de lanzamiento debe ser en el futuro,
 Relieving Date must be greater than or equal to Date of Joining,La fecha de liberación debe ser mayor o igual que la fecha de incorporación,
 Rename,Renombrar,
+Rename Not Allowed,Cambiar nombre no permitido,
 Repayment Method is mandatory for term loans,El método de reembolso es obligatorio para préstamos a plazo,
 Repayment Start Date is mandatory for term loans,La fecha de inicio de reembolso es obligatoria para préstamos a plazo,
 Report Item,Reportar articulo,
@@ -4033,7 +4027,7 @@
 Rows Removed in {0},Filas eliminadas en {0},
 Sanctioned Amount limit crossed for {0} {1},Límite de cantidad sancionado cruzado por {0} {1},
 Sanctioned Loan Amount already exists for {0} against company {1},El monto del préstamo sancionado ya existe para {0} contra la compañía {1},
-Save,Guardar,
+Save,Speichern,
 Save Item,Guardar artículo,
 Saved Items,Artículos guardados,
 Search Items ...,Buscar artículos ...,
@@ -4043,7 +4037,6 @@
 Select All,Seleccionar todo,
 Select Difference Account,Seleccionar cuenta de diferencia,
 Select a Default Priority.,Seleccione una prioridad predeterminada.,
-Select a Supplier from the Default Supplier List of the items below.,Seleccione un proveedor de la lista de proveedores predeterminados de los siguientes artículos.,
 Select a company,Selecciona una empresa,
 Select finance book for the item {0} at row {1},Seleccione el libro de finanzas para el artículo {0} en la fila {1},
 Select only one Priority as Default.,Seleccione solo una prioridad como predeterminada.,
@@ -4247,7 +4240,6 @@
 Actual ,Actual,
 Add to cart,Añadir a la Cesta,
 Budget,Presupuesto,
-Chart Of Accounts Importer,Importador de plan de cuentas,
 Chart of Accounts,Catálogo de cuentas,
 Customer database.,Base de datos de cliente.,
 Days Since Last order,Días desde la última orden,
@@ -4546,7 +4538,6 @@
 Check Supplier Invoice Number Uniqueness,Comprobar número de factura único por proveedor,
 Make Payment via Journal Entry,Hace el pago vía entrada de diario,
 Unlink Payment on Cancellation of Invoice,Desvinculación de Pago en la cancelación de la factura,
-Unlink Advance Payment on Cancelation of Order,Desvincular pago anticipado por cancelación de pedido,
 Book Asset Depreciation Entry Automatically,Entrada de depreciación de activos de libro de forma automática,
 Automatically Add Taxes and Charges from Item Tax Template,Agregar automáticamente impuestos y cargos de la plantilla de impuestos de artículos,
 Automatically Fetch Payment Terms,Obtener automáticamente las condiciones de pago,
@@ -4940,7 +4931,6 @@
 POS Customer Group,POS Grupo de Clientes,
 POS Field,Campo POS,
 POS Item Group,POS Grupo de artículos,
-[Select],[Seleccionar],
 Company Address,Dirección de la Compañía,
 Update Stock,Actualizar el Inventario,
 Ignore Pricing Rule,Ignorar la Regla Precios,
@@ -6481,7 +6471,6 @@
 Appraisal Template,Plantilla de evaluación,
 For Employee Name,Por nombre de empleado,
 Goals,Objetivos,
-Calculate Total Score,Calcular puntaje total,
 Total Score (Out of 5),Puntaje Total (de 5),
 "Any other remarks, noteworthy effort that should go in the records.","Otras observaciones, que deben ir en los registros.",
 Appraisal Goal,Meta de evaluación,
@@ -6599,11 +6588,6 @@
 Reason for Leaving,Razones de renuncia,
 Leave Encashed?,Vacaciones pagadas?,
 Encashment Date,Fecha de Cobro,
-Exit Interview Details,Detalles de Entrevista de Salida,
-Held On,Retenida en,
-Reason for Resignation,Motivo de la renuncia,
-Better Prospects,Mejores Prospectos,
-Health Concerns,Problemas de salud,
 New Workplace,Nuevo lugar de trabajo,
 HR-EAD-.YYYY.-,HR-EAD-.YYYY.-,
 Returned Amount,Cantidad devuelta,
@@ -8239,9 +8223,6 @@
 Manufacturers used in Items,Fabricantes utilizados en artículos,
 Limited to 12 characters,Limitado a 12 caracteres,
 MAT-MR-.YYYY.-,MAT-MR-.YYYY.-,
-Set Warehouse,Establecer almacén,
-Sets 'For Warehouse' in each row of the Items table.,Establece &#39;Para almacén&#39; en cada fila de la tabla Artículos.,
-Requested For,Solicitado por,
 Partially Ordered,Parcialmente ordenado,
 Transferred,Transferido,
 % Ordered,% Ordenado,
@@ -8690,8 +8671,6 @@
 Select warehouse for material requests,Seleccionar almacén para solicitudes de material,
 Transfer Materials For Warehouse {0},Transferir materiales para almacén {0},
 Production Plan Material Request Warehouse,Almacén de solicitud de material de plan de producción,
-Set From Warehouse,Establecer desde almacén,
-Source Warehouse (Material Transfer),Almacén de origen (transferencia de material),
 Sets 'Source Warehouse' in each row of the items table.,Establece &#39;Almacén de origen&#39; en cada fila de la tabla de artículos.,
 Sets 'Target Warehouse' in each row of the items table.,Establece &#39;Almacén de destino&#39; en cada fila de la tabla de artículos.,
 Show Cancelled Entries,Mostrar entradas canceladas,
@@ -9157,7 +9136,6 @@
 Is Income Tax Component,Es el componente del impuesto sobre la renta,
 Component properties and references ,Propiedades y referencias de componentes,
 Additional Salary ,Salario adicional,
-Condtion and formula,Condición y fórmula,
 Unmarked days,Días sin marcar,
 Absent Days,Días ausentes,
 Conditions and Formula variable and example,Condiciones y variable de fórmula y ejemplo,
@@ -9444,7 +9422,6 @@
 Please check your Plaid client ID and secret values,Verifique su ID de cliente de Plaid y sus valores secretos,
 Bank transaction creation error,Error de creación de transacción bancaria,
 Unit of Measurement,Unidad de medida,
-Row #{}: Selling rate for item {} is lower than its {}. Selling rate should be atleast {},Fila # {}: la tasa de venta del artículo {} es menor que su {}. La tasa de venta debe ser al menos {},
 Fiscal Year {0} Does Not Exist,El año fiscal {0} no existe,
 Row # {0}: Returned Item {1} does not exist in {2} {3},Fila n.º {0}: el artículo devuelto {1} no existe en {2} {3},
 Valuation type charges can not be marked as Inclusive,Los cargos por tipo de valoración no se pueden marcar como inclusivos,
@@ -9598,8 +9575,60 @@
 Response Time for {0} priority in row {1} can't be greater than Resolution Time.,El tiempo de respuesta para la {0} prioridad en la fila {1} no puede ser mayor que el tiempo de resolución.,
 {0} is not enabled in {1},{0} no está habilitado en {1},
 Group by Material Request,Agrupar por solicitud de material,
-"Row {0}: For Supplier {0}, Email Address is Required to Send Email","Fila {0}: para el proveedor {0}, se requiere la dirección de correo electrónico para enviar correo electrónico",
 Email Sent to Supplier {0},Correo electrónico enviado al proveedor {0},
 "The Access to Request for Quotation From Portal is Disabled. To Allow Access, Enable it in Portal Settings.","El acceso a la solicitud de cotización del portal está deshabilitado. Para permitir el acceso, habilítelo en la configuración del portal.",
 Supplier Quotation {0} Created,Cotización de proveedor {0} creada,
 Valid till Date cannot be before Transaction Date,La fecha válida hasta la fecha no puede ser anterior a la fecha de la transacción,
+Unlink Advance Payment on Cancellation of Order,Desvincular el pago por adelantado en la cancelación de un pedido,
+"Simple Python Expression, Example: territory != 'All Territories'","Expresión simple de Python, ejemplo: territorio! = &#39;Todos los territorios&#39;",
+Sales Contributions and Incentives,Contribuciones e incentivos de ventas,
+Sourced by Supplier,Obtenido por proveedor,
+Total weightage assigned should be 100%.<br>It is {0},El peso total asignado debe ser del 100%.<br> Es {0},
+Account {0} exists in parent company {1}.,La cuenta {0} existe en la empresa matriz {1}.,
+"To overrule this, enable '{0}' in company {1}","Para anular esto, habilite &quot;{0}&quot; en la empresa {1}",
+Invalid condition expression,Expresión de condición no válida,
+Please Select a Company First,Primero seleccione una empresa,
+Please Select Both Company and Party Type First,Primero seleccione tanto la empresa como el tipo de partido,
+Provide the invoice portion in percent,Proporcione la parte de la factura en porcentaje,
+Give number of days according to prior selection,Dar número de días según selección previa,
+Email Details,Detalles de correo electrónico,
+"Select a greeting for the receiver. E.g. Mr., Ms., etc.","Seleccione un saludo para el receptor. Por ejemplo, Sr., Sra., Etc.",
+Preview Email,Vista previa del correo electrónico,
+Please select a Supplier,Seleccione un proveedor,
+Supplier Lead Time (days),Plazo de ejecución del proveedor (días),
+"Home, Work, etc.","Hogar, trabajo, etc.",
+Exit Interview Held On,Entrevista de salida retenida,
+Condition and formula,Condición y fórmula,
+Sets 'Target Warehouse' in each row of the Items table.,Establece &#39;Almacén de destino&#39; en cada fila de la tabla Artículos.,
+Sets 'Source Warehouse' in each row of the Items table.,Establece &#39;Almacén de origen&#39; en cada fila de la tabla Artículos.,
+POS Register,Registro POS,
+"Can not filter based on POS Profile, if grouped by POS Profile","No se puede filtrar según el perfil de POS, si está agrupado por perfil de POS",
+"Can not filter based on Customer, if grouped by Customer","No se puede filtrar según el Cliente, si está agrupado por Cliente",
+"Can not filter based on Cashier, if grouped by Cashier","No se puede filtrar según el cajero, si está agrupado por cajero",
+Payment Method,Método de pago,
+"Can not filter based on Payment Method, if grouped by Payment Method","No se puede filtrar según el método de pago, si está agrupado por método de pago",
+Supplier Quotation Comparison,Comparación de cotizaciones de proveedores,
+Price per Unit (Stock UOM),Precio por unidad (UOM de stock),
+Group by Supplier,Agrupar por proveedor,
+Group by Item,Agrupar por artículo,
+Remember to set {field_label}. It is required by {regulation}.,Recuerde configurar {field_label}. Es requerido por {regulación}.,
+Enrollment Date cannot be before the Start Date of the Academic Year {0},La fecha de inscripción no puede ser anterior a la fecha de inicio del año académico {0},
+Enrollment Date cannot be after the End Date of the Academic Term {0},La fecha de inscripción no puede ser posterior a la fecha de finalización del período académico {0},
+Enrollment Date cannot be before the Start Date of the Academic Term {0},La fecha de inscripción no puede ser anterior a la fecha de inicio del período académico {0},
+Posting future transactions are not allowed due to Immutable Ledger,No se permite la contabilización de transacciones futuras debido al libro mayor inmutable,
+Future Posting Not Allowed,Publicaciones futuras no permitidas,
+"To enable Capital Work in Progress Accounting, ","Para habilitar la contabilidad del trabajo de capital en curso,",
+you must select Capital Work in Progress Account in accounts table,debe seleccionar Cuenta Capital Work in Progress en la tabla de cuentas,
+You can also set default CWIP account in Company {},También puede configurar una cuenta CWIP predeterminada en la empresa {},
+The Request for Quotation can be accessed by clicking on the following button,Se puede acceder a la Solicitud de Cotización haciendo clic en el siguiente botón,
+Regards,Saludos,
+Please click on the following button to set your new password,Haga clic en el siguiente botón para establecer su nueva contraseña,
+Update Password,Actualiza contraseña,
+Row #{}: Selling rate for item {} is lower than its {}. Selling {} should be atleast {},Fila # {}: la tasa de venta del artículo {} es menor que su {}. La venta {} debe ser al menos {},
+You can alternatively disable selling price validation in {} to bypass this validation.,"Alternativamente, puede deshabilitar la validación del precio de venta en {} para omitir esta validación.",
+Invalid Selling Price,Precio de venta no válido,
+Address needs to be linked to a Company. Please add a row for Company in the Links table.,La dirección debe estar vinculada a una empresa. Agregue una fila para Compañía en la tabla Vínculos.,
+Company Not Linked,Empresa no vinculada,
+Import Chart of Accounts from CSV / Excel files,Importar plan de cuentas desde archivos CSV / Excel,
+Completed Qty cannot be greater than 'Qty to Manufacture',La cantidad completa no puede ser mayor que la &#39;Cantidad para fabricar&#39;,
+"Row {0}: For Supplier {1}, Email Address is Required to send an email","Fila {0}: para el proveedor {1}, se requiere la dirección de correo electrónico para enviar un correo electrónico.",
diff --git a/erpnext/translations/es_gt.csv b/erpnext/translations/es_gt.csv
index 2c8dac8..efd2daa 100644
--- a/erpnext/translations/es_gt.csv
+++ b/erpnext/translations/es_gt.csv
@@ -1,4 +1,3 @@
-Chart Of Accounts,Plan de Cuentas,
 Item,Producto,
 Lead Time Days,Tiempo de ejecución en días,
 Outstanding,Pendiente,
diff --git a/erpnext/translations/es_pe.csv b/erpnext/translations/es_pe.csv
index 2dfb04b..e3ce500 100644
--- a/erpnext/translations/es_pe.csv
+++ b/erpnext/translations/es_pe.csv
@@ -67,7 +67,6 @@
 Cash In Hand,Efectivo Disponible,
 City/Town,Ciudad/Provincia,
 Commission on Sales,Comisión de Ventas,
-Completed Qty can not be greater than 'Qty to Manufacture',La cantidad completada no puede ser mayor que la cantidad a producir,
 Confirmed orders from Customers.,Pedidos en firme de los clientes.,
 Consumed Amount,Cantidad Consumida,
 Contact Details,Datos del Contacto,
@@ -728,7 +727,6 @@
 "Here you can maintain height, weight, allergies, medical concerns etc","Aquí usted puede mantener la altura , el peso, alergias , problemas médicos , etc",
 Educational Qualification,Capacitación Académica,
 Leave Encashed?,Vacaciones Descansadas?,
-Health Concerns,Preocupaciones de salud,
 School/University,Escuela / Universidad,
 Under Graduate,Bajo Graduación,
 Year of Passing,Año de Fallecimiento,
@@ -938,7 +936,6 @@
 Purchase Receipt Item,Recibo de Compra del Artículo,
 Purchase Receipt Items,Artículos de Recibo de Compra,
 Get Items From Purchase Receipts,Obtener los elementos desde Recibos de Compra,
-Requested For,Solicitados para,
 % Ordered,% Pedido,
 Terms and Conditions Content,Términos y Condiciones Contenido,
 Lead Time Date,Fecha y Hora de la Iniciativa,
diff --git a/erpnext/translations/et.csv b/erpnext/translations/et.csv
index 1ae39b0..27335a8 100644
--- a/erpnext/translations/et.csv
+++ b/erpnext/translations/et.csv
@@ -521,7 +521,6 @@
 Chargeble,Tasuline,
 Charges are updated in Purchase Receipt against each item,Maksud uuendatakse ostutšekk iga punkti,
 "Charges will be distributed proportionately based on item qty or amount, as per your selection","Maksud jagatakse proportsionaalselt aluseks on elemendi Kogus või summa, ühe oma valikut",
-Chart Of Accounts,Kontoplaan,
 Chart of Cost Centers,Graafik kulukeskuste,
 Check all,Vaata kõiki,
 Checkout,Minu tellimused,
@@ -581,7 +580,6 @@
 Compensatory Off,Tasandusintress Off,
 Compensatory leave request days not in valid holidays,Hüvitisepuhkuse taotluste päevad pole kehtivate pühade ajal,
 Complaint,Kaebus,
-Completed Qty can not be greater than 'Qty to Manufacture',Valminud Kogus ei saa olla suurem kui &quot;Kogus et Tootmine&quot;,
 Completion Date,Lõppkuupäev,
 Computer,Arvuti,
 Condition,Seisund,
@@ -2033,7 +2031,6 @@
 Please select Charge Type first,Palun valige Charge Type esimene,
 Please select Company,Palun valige Company,
 Please select Company and Designation,Palun vali ettevõte ja nimetus,
-Please select Company and Party Type first,Palun valige Company Pidu ja Type esimene,
 Please select Company and Posting Date to getting entries,Kirjete saamiseks valige ettevõtte ja postitamise kuupäev,
 Please select Company first,Palun valige Company esimene,
 Please select Completion Date for Completed Asset Maintenance Log,Palun vali lõpetatud varade hoolduse logi täitmise kuupäev,
@@ -2980,7 +2977,6 @@
 The name of your company for which you are setting up this system.,"Nimi oma firma jaoks, millele te Selle süsteemi rajamisel.",
 The number of shares and the share numbers are inconsistent,Aktsiate arv ja aktsiate arv on ebajärjekindlad,
 The payment gateway account in plan {0} is different from the payment gateway account in this payment request,Kava {0} maksejuhtseade erineb selle maksetaotluses olevast maksejõu kontolt,
-The request for quotation can be accessed by clicking on the following link,Taotluse tsitaat pääseb klõpsates järgmist linki,
 The selected BOMs are not for the same item,Valitud BOMs ei ole sama objekti,
 The selected item cannot have Batch,Valitud parameetrit ei ole partii,
 The seller and the buyer cannot be the same,Müüja ja ostja ei saa olla sama,
@@ -3130,7 +3126,6 @@
 Total flexible benefit component amount {0} should not be less than max benefits {1},Paindliku hüvitise komponendi summa {0} ei tohiks olla väiksem kui maksimaalne kasu {1},
 Total hours: {0},Kursuse maht: {0},
 Total leaves allocated is mandatory for Leave Type {0},Lehtede kogusumma on kohustuslik väljumiseks Tüüp {0},
-Total weightage assigned should be 100%. It is {0},Kokku weightage määratud peaks olema 100%. On {0},
 Total working hours should not be greater than max working hours {0},Kokku tööaeg ei tohi olla suurem kui max tööaeg {0},
 Total {0} ({1}),Kokku {0} ({1}),
 "Total {0} for all items is zero, may be you should change 'Distribute Charges Based On'","Kokku {0} kõik elemendid on null, võib olla sa peaksid muutma &quot;Hajuta põhinevad maksud&quot;",
@@ -3544,7 +3539,6 @@
 Company field is required,Ettevõtte väli on kohustuslik,
 Creating Dimensions...,Mõõtmete loomine ...,
 Duplicate entry against the item code {0} and manufacturer {1},Tootekoodi {0} ja tootja {1} koopia,
-Import Chart Of Accounts from CSV / Excel files,Kontograafiku importimine CSV / Exceli failidest,
 Invalid GSTIN! The input you've entered doesn't match the GSTIN format for UIN Holders or Non-Resident OIDAR Service Providers,Kehtetu GSTIN! Teie sisestatud sisend ei vasta UIN-i omanike või mitteresidentide OIDAR-teenuse pakkujate GSTIN-vormingule,
 Invoice Grand Total,Arve suur kokku,
 Last carbon check date cannot be a future date,Viimane süsiniku kontrollimise kuupäev ei saa olla tulevane kuupäev,
@@ -3921,7 +3915,6 @@
 Plaid public token error,Avalik sümboolne viga,
 Plaid transactions sync error,Tavalise tehingu sünkroonimisviga,
 Please check the error log for details about the import errors,Importimisvigade üksikasjade kohta kontrollige vealogi,
-Please click on the following link to set your new password,Palun kliki järgmist linki seada oma uus parool,
 Please create <b>DATEV Settings</b> for Company <b>{}</b>.,Palun looge ettevõtte <b>{}</b> jaoks <b>DATEV-i seaded</b> .,
 Please create adjustment Journal Entry for amount {0} ,Palun loo korrigeeriv ajakirja kanne summa {0} jaoks,
 Please do not create more than 500 items at a time,Ärge looge rohkem kui 500 eset korraga,
@@ -3997,6 +3990,7 @@
 Release date must be in the future,Väljalaskekuupäev peab olema tulevikus,
 Relieving Date must be greater than or equal to Date of Joining,Vabastamiskuupäev peab olema liitumiskuupäevast suurem või sellega võrdne,
 Rename,Nimeta,
+Rename Not Allowed,Ümbernimetamine pole lubatud,
 Repayment Method is mandatory for term loans,Tagasimakseviis on tähtajaliste laenude puhul kohustuslik,
 Repayment Start Date is mandatory for term loans,Tagasimakse alguskuupäev on tähtajaliste laenude puhul kohustuslik,
 Report Item,Aruande üksus,
@@ -4043,7 +4037,6 @@
 Select All,Vali kõik,
 Select Difference Account,Valige Erinevuste konto,
 Select a Default Priority.,Valige vaikimisi prioriteet.,
-Select a Supplier from the Default Supplier List of the items below.,Valige allolevate üksuste vaiktarnijate loendist tarnija.,
 Select a company,Valige ettevõte,
 Select finance book for the item {0} at row {1},Valige real {1} kirje {0} finantseerimisraamat,
 Select only one Priority as Default.,Valige vaikimisi ainult üks prioriteet.,
@@ -4247,7 +4240,6 @@
 Actual ,Tegelik,
 Add to cart,Lisa ostukorvi,
 Budget,Eelarve,
-Chart Of Accounts Importer,Kontoplaani importija,
 Chart of Accounts,Kontode kaart,
 Customer database.,Kliendiandmebaas.,
 Days Since Last order,Päeva eelmisest Telli,
@@ -4546,7 +4538,6 @@
 Check Supplier Invoice Number Uniqueness,Vaata Tarnija Arve number Uniqueness,
 Make Payment via Journal Entry,Tee makse kaudu päevikusissekanne,
 Unlink Payment on Cancellation of Invoice,Lingi eemaldada Makse tühistamine Arve,
-Unlink Advance Payment on Cancelation of Order,Vabastage ettemakse link tellimuse tühistamise korral,
 Book Asset Depreciation Entry Automatically,Broneeri Asset amortisatsioon Entry automaatselt,
 Automatically Add Taxes and Charges from Item Tax Template,Lisage maksud ja lõivud automaatselt üksuse maksumallilt,
 Automatically Fetch Payment Terms,Maksetingimuste automaatne toomine,
@@ -4940,7 +4931,6 @@
 POS Customer Group,POS Kliendi Group,
 POS Field,POS-väli,
 POS Item Group,POS Artikliklasside,
-[Select],[Vali],
 Company Address,ettevõtte aadress,
 Update Stock,Värskenda Stock,
 Ignore Pricing Rule,Ignoreeri Hinnakujundus reegel,
@@ -6481,7 +6471,6 @@
 Appraisal Template,Hinnang Mall,
 For Employee Name,Töötajate Nimi,
 Goals,Eesmärgid,
-Calculate Total Score,Arvuta üldskoor,
 Total Score (Out of 5),Üldskoor (Out of 5),
 "Any other remarks, noteworthy effort that should go in the records.","Muid märkusi, tähelepanuväärne jõupingutusi, et peaks minema arvestust.",
 Appraisal Goal,Hinnang Goal,
@@ -6599,11 +6588,6 @@
 Reason for Leaving,Põhjus lahkumiseks,
 Leave Encashed?,Jäta realiseeritakse?,
 Encashment Date,Inkassatsioon kuupäev,
-Exit Interview Details,Exit Intervjuu Üksikasjad,
-Held On,Toimunud,
-Reason for Resignation,Lahkumise põhjuseks,
-Better Prospects,Paremad väljavaated,
-Health Concerns,Terviseprobleemid,
 New Workplace,New Töökoht,
 HR-EAD-.YYYY.-,HR-EAD-.YYYY.-,
 Returned Amount,Tagastatud summa,
@@ -8239,9 +8223,6 @@
 Manufacturers used in Items,Tootjad kasutada Esemed,
 Limited to 12 characters,Üksnes 12 tähemärki,
 MAT-MR-.YYYY.-,MAT-MR-.YYYY.-,
-Set Warehouse,Määra ladu,
-Sets 'For Warehouse' in each row of the Items table.,Määrab tabeli Üksused igale reale „For Warehouse”.,
-Requested For,Taotletakse,
 Partially Ordered,Osaliselt tellitud,
 Transferred,üle,
 % Ordered,% Tellitud,
@@ -8690,8 +8671,6 @@
 Select warehouse for material requests,Materjalitaotluste jaoks valige ladu,
 Transfer Materials For Warehouse {0},Lao materjalide edastamine {0},
 Production Plan Material Request Warehouse,Tootmiskava materjalitaotluse ladu,
-Set From Warehouse,Komplekt laost,
-Source Warehouse (Material Transfer),Allika ladu (materjaliülekanne),
 Sets 'Source Warehouse' in each row of the items table.,Määrab üksuste tabeli igale reale &#39;Allika ladu&#39;.,
 Sets 'Target Warehouse' in each row of the items table.,Määrab üksuste tabeli igale reale &#39;Sihtlao&#39;.,
 Show Cancelled Entries,Kuva tühistatud kirjed,
@@ -9157,7 +9136,6 @@
 Is Income Tax Component,Kas tulumaksu komponent,
 Component properties and references ,Komponendi omadused ja viited,
 Additional Salary ,Lisapalk,
-Condtion and formula,Tingimus ja valem,
 Unmarked days,Märgistamata päevad,
 Absent Days,Puuduvad päevad,
 Conditions and Formula variable and example,Tingimused ja valemi muutuja ning näide,
@@ -9444,7 +9422,6 @@
 Please check your Plaid client ID and secret values,Kontrollige oma Plaid-kliendi ID-d ja salajasi väärtusi,
 Bank transaction creation error,Pangatehingute loomise viga,
 Unit of Measurement,Mõõtühik,
-Row #{}: Selling rate for item {} is lower than its {}. Selling rate should be atleast {},Rida nr {}: üksuse {} müügimäär on madalam kui selle {}. Müügimäär peaks olema vähemalt {},
 Fiscal Year {0} Does Not Exist,Eelarveaasta {0} puudub,
 Row # {0}: Returned Item {1} does not exist in {2} {3},Rida nr {0}: tagastatud üksust {1} pole piirkonnas {2} {3},
 Valuation type charges can not be marked as Inclusive,Hindamistüübi tasusid ei saa märkida kaasavateks,
@@ -9598,8 +9575,60 @@
 Response Time for {0} priority in row {1} can't be greater than Resolution Time.,{0} Rea {1} prioriteedi reageerimisaeg ei tohi olla pikem kui eraldusvõime aeg.,
 {0} is not enabled in {1},{0} pole piirkonnas {1} lubatud,
 Group by Material Request,Rühmitage materjalitaotluse järgi,
-"Row {0}: For Supplier {0}, Email Address is Required to Send Email",Rida {0}: tarnija {0} jaoks on e-posti saatmiseks vaja e-posti aadressi,
 Email Sent to Supplier {0},Tarnijale saadetud e-post {0},
 "The Access to Request for Quotation From Portal is Disabled. To Allow Access, Enable it in Portal Settings.",Juurdepääs portaali hinnapakkumistele on keelatud. Juurdepääsu lubamiseks lubage see portaali seadetes.,
 Supplier Quotation {0} Created,Tarnija pakkumine {0} loodud,
 Valid till Date cannot be before Transaction Date,Kehtiv kuupäev ei saa olla enne tehingu kuupäeva,
+Unlink Advance Payment on Cancellation of Order,Tühistage ettemakse tellimuse tühistamisel,
+"Simple Python Expression, Example: territory != 'All Territories'","Lihtne Pythoni väljend, näide: territoorium! = &#39;Kõik territooriumid&#39;",
+Sales Contributions and Incentives,Müügimaksed ja stiimulid,
+Sourced by Supplier,Hankinud tarnija,
+Total weightage assigned should be 100%.<br>It is {0},Määratud kogukaal peaks olema 100%.<br> See on {0},
+Account {0} exists in parent company {1}.,Konto {0} on emaettevõttes {1}.,
+"To overrule this, enable '{0}' in company {1}",Selle tühistamiseks lubage ettevõttes „{0}” {1},
+Invalid condition expression,Vale tingimuse avaldis,
+Please Select a Company First,Valige kõigepealt ettevõte,
+Please Select Both Company and Party Type First,Palun valige kõigepealt nii ettevõtte kui ka peo tüüp,
+Provide the invoice portion in percent,Esitage arve osa protsentides,
+Give number of days according to prior selection,Esitage päevade arv vastavalt eelnevale valikule,
+Email Details,E-posti üksikasjad,
+"Select a greeting for the receiver. E.g. Mr., Ms., etc.","Valige vastuvõtjale tervitus. Nt härra, proua jne.",
+Preview Email,E-posti eelvaade,
+Please select a Supplier,Valige tarnija,
+Supplier Lead Time (days),Tarnija tarneaeg (päevades),
+"Home, Work, etc.","Kodu, töökoht jne.",
+Exit Interview Held On,Väljumisintervjuu on pooleli,
+Condition and formula,Seisund ja valem,
+Sets 'Target Warehouse' in each row of the Items table.,Määrab tabeli Üksused igale reale &#39;Sihtlao&#39;.,
+Sets 'Source Warehouse' in each row of the Items table.,Määrab tabeli Üksused igale reale &#39;Allika ladu&#39;.,
+POS Register,POSide register,
+"Can not filter based on POS Profile, if grouped by POS Profile",POS-profiili järgi ei saa filtreerida POS-profiili järgi,
+"Can not filter based on Customer, if grouped by Customer","Kliendi järgi ei saa filtreerida, kui see on rühmitatud kliendi järgi",
+"Can not filter based on Cashier, if grouped by Cashier",Kasseri järgi ei saa filtreerida kassapõhiselt,
+Payment Method,Makseviis,
+"Can not filter based on Payment Method, if grouped by Payment Method","Makseviisi järgi ei saa filtreerida, kui see on rühmitatud makseviisi järgi",
+Supplier Quotation Comparison,Tarnijate pakkumiste võrdlus,
+Price per Unit (Stock UOM),Ühiku hind (varu UOM),
+Group by Supplier,Rühmitage tarnija järgi,
+Group by Item,Rühmitage üksuste kaupa,
+Remember to set {field_label}. It is required by {regulation}.,Ärge unustage määrata {field_label}. Seda nõuab {määrus}.,
+Enrollment Date cannot be before the Start Date of the Academic Year {0},Registreerumise kuupäev ei tohi olla varasem kui õppeaasta alguskuupäev {0},
+Enrollment Date cannot be after the End Date of the Academic Term {0},Registreerumise kuupäev ei tohi olla akadeemilise tähtaja lõppkuupäevast {0},
+Enrollment Date cannot be before the Start Date of the Academic Term {0},Registreerumise kuupäev ei tohi olla varasem kui akadeemilise termini alguskuupäev {0},
+Posting future transactions are not allowed due to Immutable Ledger,Tulevaste tehingute postitamine pole lubatud muutumatu pearaamatu tõttu,
+Future Posting Not Allowed,Tulevane postitamine pole lubatud,
+"To enable Capital Work in Progress Accounting, ",Kapitalitöö jätkamise raamatupidamise lubamiseks,
+you must select Capital Work in Progress Account in accounts table,kontode tabelis peate valima Töötlemata konto,
+You can also set default CWIP account in Company {},CWIP-i vaikekonto saate määrata ka ettevõttes {},
+The Request for Quotation can be accessed by clicking on the following button,Hinnapakkumisele pääsete juurde klõpsates järgmist nuppu,
+Regards,Tervitades,
+Please click on the following button to set your new password,Uue parooli määramiseks klõpsake järgmisel nupul,
+Update Password,Parooli värskendamine,
+Row #{}: Selling rate for item {} is lower than its {}. Selling {} should be atleast {},Rida nr {}: üksuse {} müügimäär on madalam kui selle {}. Müük {} peaks olema vähemalt {},
+You can alternatively disable selling price validation in {} to bypass this validation.,Selle valideerimise vältimiseks võite müügihindade valideerimise keelata asukohas {}.,
+Invalid Selling Price,Vale müügihind,
+Address needs to be linked to a Company. Please add a row for Company in the Links table.,Aadress tuleb ettevõttega linkida. Lisage tabelisse Lingid ettevõtte rida.,
+Company Not Linked,Ettevõte pole lingitud,
+Import Chart of Accounts from CSV / Excel files,Kontoplaani import CSV / Exceli failidest,
+Completed Qty cannot be greater than 'Qty to Manufacture',Täidetud kogus ei tohi olla suurem kui „tootmise kogus”,
+"Row {0}: For Supplier {1}, Email Address is Required to send an email",Rida {0}: tarnija {1} jaoks on meili saatmiseks vaja e-posti aadressi,
diff --git a/erpnext/translations/fa.csv b/erpnext/translations/fa.csv
index 7c05d34..08e1068 100644
--- a/erpnext/translations/fa.csv
+++ b/erpnext/translations/fa.csv
@@ -521,7 +521,6 @@
 Chargeble,شارژ,
 Charges are updated in Purchase Receipt against each item,اتهامات در رسید خرید بر علیه هر یک از آیتم به روز شده,
 "Charges will be distributed proportionately based on item qty or amount, as per your selection",اتهامات خواهد شد توزیع متناسب در تعداد آیتم یا مقدار بر اساس، به عنوان در هر انتخاب شما,
-Chart Of Accounts,ساختار حسابها,
 Chart of Cost Centers,نمودار مراکز هزینه,
 Check all,بررسی همه,
 Checkout,وارسی,
@@ -581,7 +580,6 @@
 Compensatory Off,جبرانی فعال,
 Compensatory leave request days not in valid holidays,درخواست روز بازپرداخت جبران خسارت در تعطیلات معتبر,
 Complaint,شکایت,
-Completed Qty can not be greater than 'Qty to Manufacture',تکمیل تعداد نمی تواند بیشتر از &#39;تعداد برای تولید&#39;,
 Completion Date,تاریخ تکمیل,
 Computer,کامپیوتر,
 Condition,شرط,
@@ -2033,7 +2031,6 @@
 Please select Charge Type first,لطفا ابتدا شارژ نوع را انتخاب کنید,
 Please select Company,لطفا انتخاب کنید شرکت,
 Please select Company and Designation,لطفا شرکت و تعیین را انتخاب کنید,
-Please select Company and Party Type first,لطفا ابتدا شرکت و حزب نوع را انتخاب کنید,
 Please select Company and Posting Date to getting entries,لطفا شرکت و تاریخ ارسال را برای گرفتن نوشته انتخاب کنید,
 Please select Company first,لطفا ابتدا شرکت را انتخاب کنید,
 Please select Completion Date for Completed Asset Maintenance Log,لطفا تاریخ تکمیل را برای ورود به سیستم نگهداری دارایی تکمیل کنید,
@@ -2980,7 +2977,6 @@
 The name of your company for which you are setting up this system.,نام شرکت خود را که برای آن شما راه اندازی این سیستم.,
 The number of shares and the share numbers are inconsistent,تعداد سهام و شماره سهم ناسازگار است,
 The payment gateway account in plan {0} is different from the payment gateway account in this payment request,حساب دروازه پرداخت در برنامه {0} متفاوت از حساب دروازه پرداخت در این درخواست پرداخت است,
-The request for quotation can be accessed by clicking on the following link,درخواست برای نقل قول می توان با کلیک بر روی لینک زیر قابل دسترسی,
 The selected BOMs are not for the same item,BOM ها انتخاب شده برای آیتم یکسان نیست,
 The selected item cannot have Batch,آیتم انتخاب شده می تواند دسته ای ندارد,
 The seller and the buyer cannot be the same,فروشنده و خریدار نمیتوانند یکسان باشند,
@@ -3130,7 +3126,6 @@
 Total flexible benefit component amount {0} should not be less than max benefits {1},مقدار کامپوننت منعطف انعطاف پذیر {0} نباید کمتر از مزایای حداکثر باشد {1},
 Total hours: {0},کل ساعت: {0},
 Total leaves allocated is mandatory for Leave Type {0},مجموع برگ ها اختصاص داده شده برای نوع ترک {0} اجباری است,
-Total weightage assigned should be 100%. It is {0},بین وزنها مجموع اختصاص داده باید 100٪ باشد. این {0},
 Total working hours should not be greater than max working hours {0},کل ساعات کار نباید از ساعات کار حداکثر است بیشتر {0},
 Total {0} ({1}),مجموع {0} ({1}),
 "Total {0} for all items is zero, may be you should change 'Distribute Charges Based On'",مجموع {0} برای همه موارد صفر است، ممکن است شما باید &#39;اتهامات بر اساس توزیع را تغییر,
@@ -3544,7 +3539,6 @@
 Company field is required,زمینه شرکت مورد نیاز است,
 Creating Dimensions...,ایجاد ابعاد ...,
 Duplicate entry against the item code {0} and manufacturer {1},ورودی کپی شده در برابر کد مورد {0} و سازنده {1},
-Import Chart Of Accounts from CSV / Excel files,وارد کردن نمودار حساب از پرونده های CSV / Excel,
 Invalid GSTIN! The input you've entered doesn't match the GSTIN format for UIN Holders or Non-Resident OIDAR Service Providers,GSTIN نامعتبر است! ورودی که وارد کردید با قالب GSTIN برای دارندگان UIN یا ارائه دهندگان خدمات OIDAR غیر مقیم مطابقت ندارد,
 Invoice Grand Total,تعداد کل فاکتور,
 Last carbon check date cannot be a future date,تاریخ آخرین بررسی کربن نمی تواند یک تاریخ آینده باشد,
@@ -3921,7 +3915,6 @@
 Plaid public token error,خطای نشانه عمومی,
 Plaid transactions sync error,خطای همگام سازی معاملات کار شده,
 Please check the error log for details about the import errors,لطفاً جزئیات مربوط به خطاهای واردات را وارد کنید,
-Please click on the following link to set your new password,لطفا بر روی لینک زیر کلیک کنید برای تنظیم کلمه عبور جدید خود را,
 Please create <b>DATEV Settings</b> for Company <b>{}</b>.,لطفا ایجاد <b>DATEV تنظیمات</b> برای شرکت <b>{}.</b>,
 Please create adjustment Journal Entry for amount {0} ,لطفاً مبلغ ورود مجله تنظیم را برای مبلغ {0} ایجاد کنید,
 Please do not create more than 500 items at a time,لطفاً بیش از 500 مورد را همزمان ایجاد نکنید,
@@ -3997,6 +3990,7 @@
 Release date must be in the future,تاریخ انتشار باید در آینده باشد,
 Relieving Date must be greater than or equal to Date of Joining,Relieve Date باید بیشتر یا مساوی تاریخ عضویت باشد,
 Rename,تغییر نام,
+Rename Not Allowed,تغییر نام مجاز نیست,
 Repayment Method is mandatory for term loans,روش بازپرداخت برای وام های کوتاه مدت الزامی است,
 Repayment Start Date is mandatory for term loans,تاریخ شروع بازپرداخت برای وام های کوتاه مدت الزامی است,
 Report Item,گزارش مورد,
@@ -4043,7 +4037,6 @@
 Select All,انتخاب همه,
 Select Difference Account,حساب کاربری تفاوت را انتخاب کنید,
 Select a Default Priority.,اولویت پیش فرض را انتخاب کنید.,
-Select a Supplier from the Default Supplier List of the items below.,تأمین کننده را از لیست پیش فرض تهیه کننده موارد زیر انتخاب کنید.,
 Select a company,شرکتی را انتخاب کنید,
 Select finance book for the item {0} at row {1},کتاب مالی را برای کالا {0} در ردیف {1 Select انتخاب کنید,
 Select only one Priority as Default.,فقط یک اولویت را به عنوان پیش فرض انتخاب کنید.,
@@ -4247,7 +4240,6 @@
 Actual ,واقعی,
 Add to cart,اضافه کردن به سبد,
 Budget,بودجه,
-Chart Of Accounts Importer,وارد کننده نمودار,
 Chart of Accounts,نمودار حساب,
 Customer database.,پایگاه داده مشتری.,
 Days Since Last order,روز پس از آخرین سفارش,
@@ -4546,7 +4538,6 @@
 Check Supplier Invoice Number Uniqueness,بررسی تولید کننده فاکتور شماره منحصر به فرد,
 Make Payment via Journal Entry,پرداخت از طریق ورود مجله,
 Unlink Payment on Cancellation of Invoice,قطع ارتباط پرداخت در لغو فاکتور,
-Unlink Advance Payment on Cancelation of Order,پیوند پیش پرداخت را با لغو سفارش لغو پیوند دهید,
 Book Asset Depreciation Entry Automatically,کتاب دارایی ورودی استهلاک به صورت خودکار,
 Automatically Add Taxes and Charges from Item Tax Template,به طور خودکار مالیات و عوارض را از الگوی مالیات مورد اضافه کنید,
 Automatically Fetch Payment Terms,شرایط پرداخت به صورت خودکار را اخذ کنید,
@@ -4940,7 +4931,6 @@
 POS Customer Group,POS و ضوابط گروه,
 POS Field,زمینه POS,
 POS Item Group,POS مورد گروه,
-[Select],[انتخاب],
 Company Address,آدرس شرکت,
 Update Stock,به روز رسانی سهام,
 Ignore Pricing Rule,نادیده گرفتن قانون قیمت گذاری,
@@ -6481,7 +6471,6 @@
 Appraisal Template,ارزیابی الگو,
 For Employee Name,نام کارمند,
 Goals,اهداف,
-Calculate Total Score,محاسبه مجموع امتیاز,
 Total Score (Out of 5),نمره کل (از 5),
 "Any other remarks, noteworthy effort that should go in the records.",هر گونه اظهارات دیگر، تلاش قابل توجه است که باید در پرونده بروید.,
 Appraisal Goal,ارزیابی هدف,
@@ -6599,11 +6588,6 @@
 Reason for Leaving,دلیلی برای ترک,
 Leave Encashed?,ترک نقد شدنی؟,
 Encashment Date,Encashment عضویت,
-Exit Interview Details,جزییات خروج مصاحبه,
-Held On,برگزار,
-Reason for Resignation,دلیل استعفای,
-Better Prospects,چشم انداز بهتر,
-Health Concerns,نگرانی های بهداشتی,
 New Workplace,جدید محل کار,
 HR-EAD-.YYYY.-,HR-EAD- .YYYY.-,
 Returned Amount,مقدار برگشت داده شد,
@@ -8239,9 +8223,6 @@
 Manufacturers used in Items,تولید کنندگان مورد استفاده در موارد,
 Limited to 12 characters,محدود به 12 کاراکتر,
 MAT-MR-.YYYY.-,MAT-MR- .YYYY.-,
-Set Warehouse,انبار را تنظیم کنید,
-Sets 'For Warehouse' in each row of the Items table.,مجموعه &quot;برای انبار&quot; را در هر ردیف از جدول موارد قرار می دهد.,
-Requested For,درخواست برای,
 Partially Ordered,تا حدی سفارش داده شده است,
 Transferred,منتقل شده,
 % Ordered,مرتب٪,
@@ -8690,8 +8671,6 @@
 Select warehouse for material requests,انبار را برای درخواست های مواد انتخاب کنید,
 Transfer Materials For Warehouse {0},انتقال مواد برای انبار {0},
 Production Plan Material Request Warehouse,طرح تولید انبار درخواست مواد,
-Set From Warehouse,تنظیم از انبار,
-Source Warehouse (Material Transfer),انبار منبع (انتقال مواد),
 Sets 'Source Warehouse' in each row of the items table.,&quot;انبار منبع&quot; را در هر ردیف از جدول موارد تنظیم می کند.,
 Sets 'Target Warehouse' in each row of the items table.,&quot;Target Warehouse&quot; را در هر ردیف از جدول موارد تنظیم می کند.,
 Show Cancelled Entries,نمایش مطالب لغو شده,
@@ -9157,7 +9136,6 @@
 Is Income Tax Component,آیا م Taxلفه مالیات بر درآمد است,
 Component properties and references ,خصوصیات و منابع ملفه,
 Additional Salary ,حقوق اضافی,
-Condtion and formula,شرط و فرمول,
 Unmarked days,روزهای بدون علامت,
 Absent Days,روزهای غایب,
 Conditions and Formula variable and example,شرایط و متغیر فرمول و مثال,
@@ -9444,7 +9422,6 @@
 Please check your Plaid client ID and secret values,لطفاً شناسه مشتری Plaid و مقادیر محرمانه خود را بررسی کنید,
 Bank transaction creation error,خطای ایجاد تراکنش بانکی,
 Unit of Measurement,واحد اندازه گیری,
-Row #{}: Selling rate for item {} is lower than its {}. Selling rate should be atleast {},ردیف شماره {}: نرخ فروش مورد {} کمتر از {} آن است. نرخ فروش باید حداقل باشد {},
 Fiscal Year {0} Does Not Exist,سال مالی {0} وجود ندارد,
 Row # {0}: Returned Item {1} does not exist in {2} {3},ردیف شماره {0}: مورد برگشت داده شده {1} در {2} {3} وجود ندارد,
 Valuation type charges can not be marked as Inclusive,هزینه های نوع ارزیابی را نمی توان به عنوان فراگیر علامت گذاری کرد,
@@ -9598,8 +9575,60 @@
 Response Time for {0} priority in row {1} can't be greater than Resolution Time.,زمان پاسخ برای {0} اولویت در ردیف {1} نمی تواند بیشتر از زمان وضوح باشد.,
 {0} is not enabled in {1},{0} در {1} فعال نیست,
 Group by Material Request,گروه بندی براساس درخواست مواد,
-"Row {0}: For Supplier {0}, Email Address is Required to Send Email",ردیف {0}: برای تأمین کننده {0} ، آدرس ایمیل برای ارسال ایمیل لازم است,
 Email Sent to Supplier {0},ایمیل به تأمین کننده ارسال شد {0},
 "The Access to Request for Quotation From Portal is Disabled. To Allow Access, Enable it in Portal Settings.",دسترسی به درخواست قیمت از پورتال غیرفعال است. برای اجازه دسترسی ، آن را در تنظیمات پورتال فعال کنید.,
 Supplier Quotation {0} Created,قیمت عرضه کننده {0} ایجاد شد,
 Valid till Date cannot be before Transaction Date,معتبر تا تاریخ نمی تواند قبل از تاریخ معامله باشد,
+Unlink Advance Payment on Cancellation of Order,پیش پرداخت لغو سفارش را لغو پیوند کنید,
+"Simple Python Expression, Example: territory != 'All Territories'",بیان ساده پایتون ، مثال: Territory! = &#39;All Territories&#39;,
+Sales Contributions and Incentives,مشارکت ها و مشوق های فروش,
+Sourced by Supplier,منبع تأمین کننده,
+Total weightage assigned should be 100%.<br>It is {0},وزن کل اختصاص داده شده باید 100٪ باشد.<br> این {0} است,
+Account {0} exists in parent company {1}.,حساب {0} در شرکت مادر وجود دارد {1}.,
+"To overrule this, enable '{0}' in company {1}",برای کنار گذاشتن این مورد ، &quot;{0}&quot; را در شرکت {1} فعال کنید,
+Invalid condition expression,بیان شرط نامعتبر است,
+Please Select a Company First,لطفاً ابتدا یک شرکت را انتخاب کنید,
+Please Select Both Company and Party Type First,لطفا ابتدا هر دو نوع شرکت و مهمانی را انتخاب کنید,
+Provide the invoice portion in percent,قسمت فاکتور را به درصد ارائه دهید,
+Give number of days according to prior selection,با توجه به انتخاب قبلی ، تعداد روزها را بدهید,
+Email Details,جزئیات ایمیل,
+"Select a greeting for the receiver. E.g. Mr., Ms., etc.",یک تبریک برای گیرنده انتخاب کنید. مثلاً آقا ، خانم و غیره,
+Preview Email,پیش نمایش ایمیل,
+Please select a Supplier,لطفاً یک تامین کننده انتخاب کنید,
+Supplier Lead Time (days),زمان سرب تامین کننده (روزها),
+"Home, Work, etc.",خانه ، محل کار و غیره,
+Exit Interview Held On,مصاحبه خارج شد,
+Condition and formula,شرایط و فرمول,
+Sets 'Target Warehouse' in each row of the Items table.,&quot;Target Warehouse&quot; را در هر ردیف از جدول آیتم ها تنظیم می کند.,
+Sets 'Source Warehouse' in each row of the Items table.,&quot;منبع انبار&quot; را در هر ردیف از جدول آیتم ها تنظیم می کند.,
+POS Register,ثبت نام POS,
+"Can not filter based on POS Profile, if grouped by POS Profile",اگر براساس نمایه POS دسته بندی شود ، نمی توان براساس نمایه POS فیلتر کرد,
+"Can not filter based on Customer, if grouped by Customer",اگر براساس مشتری گروه بندی شده باشد ، نمی توان براساس مشتری فیلتر کرد,
+"Can not filter based on Cashier, if grouped by Cashier",اگر براساس صندوقدار دسته بندی شود نمی توان براساس صندوقدار فیلتر کرد,
+Payment Method,روش پرداخت,
+"Can not filter based on Payment Method, if grouped by Payment Method",اگر براساس روش پرداخت دسته بندی شود ، نمی توان براساس روش پرداخت فیلتر کرد,
+Supplier Quotation Comparison,مقایسه قیمت فروشنده,
+Price per Unit (Stock UOM),قیمت هر واحد (سهام UOM),
+Group by Supplier,گروه بندی توسط تأمین کننده,
+Group by Item,گروه بندی بر اساس مورد,
+Remember to set {field_label}. It is required by {regulation}.,فراموش نکنید که {field_label} را تنظیم کنید. این توسط {مقررات} لازم است.,
+Enrollment Date cannot be before the Start Date of the Academic Year {0},تاریخ ثبت نام نمی تواند قبل از تاریخ شروع سال تحصیلی باشد {0},
+Enrollment Date cannot be after the End Date of the Academic Term {0},تاریخ ثبت نام نمی تواند بعد از تاریخ پایان ترم تحصیلی باشد {0},
+Enrollment Date cannot be before the Start Date of the Academic Term {0},تاریخ ثبت نام نمی تواند قبل از تاریخ شروع ترم تحصیلی باشد {0},
+Posting future transactions are not allowed due to Immutable Ledger,ارسال معاملات در آینده به دلیل دفتر تغییر ناپذیر مجاز نیست,
+Future Posting Not Allowed,ارسال آینده مجاز نیست,
+"To enable Capital Work in Progress Accounting, ",برای فعال کردن سرمایه کار در حسابداری در حال پیشرفت ،,
+you must select Capital Work in Progress Account in accounts table,شما باید جدول Capital Work in Progress را در جدول حساب ها انتخاب کنید,
+You can also set default CWIP account in Company {},همچنین می توانید حساب پیش فرض CWIP را در شرکت تنظیم کنید {},
+The Request for Quotation can be accessed by clicking on the following button,با کلیک بر روی دکمه زیر می توان به درخواست برای قیمت گذاری دسترسی پیدا کرد,
+Regards,با احترام,
+Please click on the following button to set your new password,لطفاً برای تنظیم رمز ورود جدید خود بر روی دکمه زیر کلیک کنید,
+Update Password,رمز عبور را به روز کنید,
+Row #{}: Selling rate for item {} is lower than its {}. Selling {} should be atleast {},ردیف شماره {}: نرخ فروش مورد {} کمتر از {} آن است. فروش {} باید حداقل باشد {},
+You can alternatively disable selling price validation in {} to bypass this validation.,برای دور زدن این اعتبار سنجی ، می توانید اعتبار فروش قیمت را در {} غیرفعال کنید.,
+Invalid Selling Price,قیمت فروش نامعتبر است,
+Address needs to be linked to a Company. Please add a row for Company in the Links table.,آدرس باید به یک شرکت پیوند داده شود. لطفاً یک ردیف برای شرکت در جدول پیوندها اضافه کنید.,
+Company Not Linked,شرکت پیوندی ندارد,
+Import Chart of Accounts from CSV / Excel files,نمودار حساب ها را از پرونده های CSV / Excel وارد کنید,
+Completed Qty cannot be greater than 'Qty to Manufacture',تعداد تکمیل شده نمی تواند بزرگتر از &quot;تعداد تولید&quot; باشد,
+"Row {0}: For Supplier {1}, Email Address is Required to send an email",ردیف {0}: برای تامین کننده {1} ، برای ارسال نامه الکترونیکی آدرس ایمیل لازم است,
diff --git a/erpnext/translations/fi.csv b/erpnext/translations/fi.csv
index 8912848..0e62c59 100644
--- a/erpnext/translations/fi.csv
+++ b/erpnext/translations/fi.csv
@@ -521,7 +521,6 @@
 Chargeble,Chargeble,
 Charges are updated in Purchase Receipt against each item,maksut on päivitetty ostokuitilla kondistettuna jokaiseen tuotteeseen,
 "Charges will be distributed proportionately based on item qty or amount, as per your selection","maksut jaetaan suhteellisesti tuotteiden yksikkömäärän tai arvomäärän mukaan, määrityksen perusteella",
-Chart Of Accounts,Tilikartta,
 Chart of Cost Centers,Kustannuspaikkakaavio,
 Check all,Tarkista kaikki,
 Checkout,Tarkista,
@@ -581,7 +580,6 @@
 Compensatory Off,korvaava on pois,
 Compensatory leave request days not in valid holidays,Korvausvapautuspäivät eivät ole voimassaoloaikoina,
 Complaint,Valitus,
-Completed Qty can not be greater than 'Qty to Manufacture',"valmiit yksikkömäärä ei voi olla suurempi kuin ""tuotannon määrä""",
 Completion Date,katselmus päivä,
 Computer,Tietokone,
 Condition,ehto,
@@ -2033,7 +2031,6 @@
 Please select Charge Type first,Valitse ensin veloitus tyyppi,
 Please select Company,Ole hyvä ja valitse Company,
 Please select Company and Designation,Valitse Yritys ja nimike,
-Please select Company and Party Type first,Valitse ensin yritys ja osapuoli tyyppi,
 Please select Company and Posting Date to getting entries,Valitse Yritykset ja kirjauspäivämäärä saadaksesi merkinnät,
 Please select Company first,Ole hyvä ja valitse Company ensin,
 Please select Completion Date for Completed Asset Maintenance Log,Valitse Valmistuneen omaisuudenhoitorekisterin päättymispäivä,
@@ -2980,7 +2977,6 @@
 The name of your company for which you are setting up this system.,"Yrityksen nimi, jolle olet luomassa tätä järjestelmää",
 The number of shares and the share numbers are inconsistent,Osakkeiden lukumäärä ja osakemäärä ovat epäjohdonmukaisia,
 The payment gateway account in plan {0} is different from the payment gateway account in this payment request,Maksuyhdyskäytävätietojärjestelmä {0} poikkeaa maksupyyntötilistä tässä maksupyynnössä,
-The request for quotation can be accessed by clicking on the following link,Tarjouspyyntöön pääsee klikkaamalla seuraavaa linkkiä,
 The selected BOMs are not for the same item,Valitut osaluettelot eivät koske samaa nimikettä,
 The selected item cannot have Batch,Valittu tuote ei voi olla erä,
 The seller and the buyer cannot be the same,Myyjä ja ostaja eivät voi olla samat,
@@ -3130,7 +3126,6 @@
 Total flexible benefit component amount {0} should not be less than max benefits {1},Joustavan etuuskomponentin {0} kokonaismäärä ei saa olla pienempi kuin enimmäisetujen {1},
 Total hours: {0},Yhteensä tuntia: {0},
 Total leaves allocated is mandatory for Leave Type {0},Jako myönnetty määrä yhteensä on {0},
-Total weightage assigned should be 100%. It is {0},Nimetyn painoarvon tulee yhteensä olla 100%. Nyt se on {0},
 Total working hours should not be greater than max working hours {0},Yhteensä työaika ei saisi olla suurempi kuin max työaika {0},
 Total {0} ({1}),Yhteensä {0} ({1}),
 "Total {0} for all items is zero, may be you should change 'Distribute Charges Based On'","Yhteensä {0} kaikki kohteet on nolla, voi olla sinun pitäisi muuttaa &quot;välit perustuvat maksujen &#39;",
@@ -3544,7 +3539,6 @@
 Company field is required,Yrityksen kenttä on pakollinen,
 Creating Dimensions...,Luodaan ulottuvuuksia ...,
 Duplicate entry against the item code {0} and manufacturer {1},Kopio merkinnästä tuotekoodiin {0} ja valmistajaan {1},
-Import Chart Of Accounts from CSV / Excel files,Tuo tilikartta CSV / Excel-tiedostoista,
 Invalid GSTIN! The input you've entered doesn't match the GSTIN format for UIN Holders or Non-Resident OIDAR Service Providers,Virheellinen GSTIN! Antamasi syöte ei vastaa UIN-haltijoiden tai muualla kuin OIDAR-palveluntarjoajien GSTIN-muotoa,
 Invoice Grand Total,Laskun kokonaissumma,
 Last carbon check date cannot be a future date,Viimeinen hiilitarkastuspäivämäärä ei voi olla tulevaisuuden päivämäärä,
@@ -3921,7 +3915,6 @@
 Plaid public token error,Tavallinen julkinen tunnusvirhe,
 Plaid transactions sync error,Ruudullinen tapahtumien synkronointivirhe,
 Please check the error log for details about the import errors,Tarkista tuontivirheistä virheloki,
-Please click on the following link to set your new password,Klikkaa seuraavaa linkkiä asettaa uuden salasanan,
 Please create <b>DATEV Settings</b> for Company <b>{}</b>.,Luo <b>DATEV-asetukset</b> yritykselle <b>{}</b> .,
 Please create adjustment Journal Entry for amount {0} ,Luo oikaisu päiväkirjakirjaukseen summalle {0},
 Please do not create more than 500 items at a time,Älä luo enempää kuin 500 tuotetta kerrallaan,
@@ -3997,6 +3990,7 @@
 Release date must be in the future,Julkaisupäivän on oltava tulevaisuudessa,
 Relieving Date must be greater than or equal to Date of Joining,Päivityspäivämäärän on oltava suurempi tai yhtä suuri kuin Liittymispäivä,
 Rename,Nimeä uudelleen,
+Rename Not Allowed,Nimeä uudelleen ei sallita,
 Repayment Method is mandatory for term loans,Takaisinmaksutapa on pakollinen lainoille,
 Repayment Start Date is mandatory for term loans,Takaisinmaksun alkamispäivä on pakollinen lainoille,
 Report Item,Raportoi esine,
@@ -4043,7 +4037,6 @@
 Select All,Valitse kaikki,
 Select Difference Account,Valitse Ero-tili,
 Select a Default Priority.,Valitse oletusprioriteetti.,
-Select a Supplier from the Default Supplier List of the items below.,Valitse toimittaja alla olevista kohteista oletustoimittajaluettelosta.,
 Select a company,Valitse yritys,
 Select finance book for the item {0} at row {1},Valitse kohteelle {0} rivillä {1} rahoituskirja,
 Select only one Priority as Default.,Valitse vain yksi prioriteetti oletukseksi.,
@@ -4247,7 +4240,6 @@
 Actual ,kiinteä määrä,
 Add to cart,Lisää koriin,
 Budget,budjetti,
-Chart Of Accounts Importer,Tilikartta tuoja,
 Chart of Accounts,Tilikartta,
 Customer database.,Asiakastietokanta.,
 Days Since Last order,päivää edellisestä tilauksesta,
@@ -4546,7 +4538,6 @@
 Check Supplier Invoice Number Uniqueness,tarkista toimittajan laskunumeron yksilöllisyys,
 Make Payment via Journal Entry,Tee Maksu Päiväkirjakirjaus,
 Unlink Payment on Cancellation of Invoice,Linkityksen Maksu mitätöinti Lasku,
-Unlink Advance Payment on Cancelation of Order,Irrota ennakkomaksu tilauksen peruuttamisen yhteydessä,
 Book Asset Depreciation Entry Automatically,Kirja Asset Poistot Entry Automaattisesti,
 Automatically Add Taxes and Charges from Item Tax Template,Lisää verot ja maksut automaattisesti tuoteveromallista,
 Automatically Fetch Payment Terms,Hae maksuehdot automaattisesti,
@@ -4940,7 +4931,6 @@
 POS Customer Group,POS Asiakas Group,
 POS Field,POS-kenttä,
 POS Item Group,POS Kohta Group,
-[Select],[valitse],
 Company Address,yritys osoite,
 Update Stock,Päivitä varasto,
 Ignore Pricing Rule,ohita hinnoittelu sääntö,
@@ -6481,7 +6471,6 @@
 Appraisal Template,Arvioinnin mallipohjat,
 For Employee Name,Työntekijän nimeen,
 Goals,tavoitteet,
-Calculate Total Score,Laske yhteispisteet,
 Total Score (Out of 5),osumat (5:stä) yhteensä,
 "Any other remarks, noteworthy effort that should go in the records.","muut huomiot, huomioitavat asiat tulee laittaa tähän tietueeseen",
 Appraisal Goal,arvioinnin tavoite,
@@ -6599,11 +6588,6 @@
 Reason for Leaving,Poistumisen syy,
 Leave Encashed?,vapaa kuitattu rahana?,
 Encashment Date,perintä päivä,
-Exit Interview Details,poistu haastattelun lisätiedoista,
-Held On,järjesteltiin,
-Reason for Resignation,Eroamisen syy,
-Better Prospects,Parempi Näkymät,
-Health Concerns,"terveys, huolenaiheet",
 New Workplace,Uusi Työpaikka,
 HR-EAD-.YYYY.-,HR-EAD-.YYYY.-,
 Returned Amount,Palautettu määrä,
@@ -8239,9 +8223,6 @@
 Manufacturers used in Items,Valmistajat käytetään Items,
 Limited to 12 characters,Rajattu 12 merkkiin,
 MAT-MR-.YYYY.-,MAT-MR-.YYYY.-,
-Set Warehouse,Aseta Warehouse,
-Sets 'For Warehouse' in each row of the Items table.,Asettaa &#39;Varastolle&#39; Kohteet-taulukon jokaiselle riville.,
-Requested For,Pyydetty kohteelle,
 Partially Ordered,Osittain tilattu,
 Transferred,siirretty,
 % Ordered,% järjestetty,
@@ -8690,8 +8671,6 @@
 Select warehouse for material requests,Valitse varasto materiaalipyyntöjä varten,
 Transfer Materials For Warehouse {0},Siirrä materiaaleja varastoon {0},
 Production Plan Material Request Warehouse,Tuotantosuunnitelman materiaalipyyntövarasto,
-Set From Warehouse,Aseta varastosta,
-Source Warehouse (Material Transfer),Lähdevarasto (materiaalinsiirto),
 Sets 'Source Warehouse' in each row of the items table.,Asettaa &#39;Lähdevarasto&#39; kullekin tuotetaulukon riville.,
 Sets 'Target Warehouse' in each row of the items table.,Asettaa kohdevaraston kullekin tuotetaulukon riville.,
 Show Cancelled Entries,Näytä peruutetut merkinnät,
@@ -9157,7 +9136,6 @@
 Is Income Tax Component,Onko tuloverokomponentti,
 Component properties and references ,Komponenttien ominaisuudet ja viitteet,
 Additional Salary ,Lisäpalkka,
-Condtion and formula,Ehto ja kaava,
 Unmarked days,Merkitsemättömät päivät,
 Absent Days,Poissa olevat päivät,
 Conditions and Formula variable and example,Ehdot ja kaavan muuttuja ja esimerkki,
@@ -9444,7 +9422,6 @@
 Please check your Plaid client ID and secret values,Tarkista Plaid-asiakastunnuksesi ja salaiset arvosi,
 Bank transaction creation error,Pankkitapahtumien luomisvirhe,
 Unit of Measurement,Mittayksikkö,
-Row #{}: Selling rate for item {} is lower than its {}. Selling rate should be atleast {},Rivi # {}: Tuotteen {} myyntihinta on matalampi kuin sen {}. Myyntikoron tulee olla vähintään {},
 Fiscal Year {0} Does Not Exist,Tilikausi {0} ei ole olemassa,
 Row # {0}: Returned Item {1} does not exist in {2} {3},Rivi # {0}: Palautettua kohdetta {1} ei ole kohteessa {2} {3},
 Valuation type charges can not be marked as Inclusive,Arvostustyyppisiä maksuja ei voida merkitä sisältäviksi,
@@ -9598,8 +9575,60 @@
 Response Time for {0} priority in row {1} can't be greater than Resolution Time.,Vasteaika {0} rivillä {1} olevalle prioriteetille ei voi olla suurempi kuin tarkkuusaika.,
 {0} is not enabled in {1},{0} ei ole käytössä maassa {1},
 Group by Material Request,Ryhmittele materiaalipyynnön mukaan,
-"Row {0}: For Supplier {0}, Email Address is Required to Send Email",Rivi {0}: Toimittajan {0} sähköpostiosoite vaaditaan sähköpostin lähettämiseen,
 Email Sent to Supplier {0},Sähköposti lähetetty toimittajalle {0},
 "The Access to Request for Quotation From Portal is Disabled. To Allow Access, Enable it in Portal Settings.","Pääsy tarjouspyyntöön portaalista on poistettu käytöstä. Jos haluat sallia pääsyn, ota se käyttöön portaalin asetuksissa.",
 Supplier Quotation {0} Created,Toimittajan tarjous {0} luotu,
 Valid till Date cannot be before Transaction Date,Voimassa oleva päivämäärä ei voi olla ennen tapahtuman päivämäärää,
+Unlink Advance Payment on Cancellation of Order,Poista ennakkomaksu tilauksen peruuttamisen yhteydessä,
+"Simple Python Expression, Example: territory != 'All Territories'","Yksinkertainen Python-lauseke, Esimerkki: alue! = &#39;Kaikki alueet&#39;",
+Sales Contributions and Incentives,Myynnin osuus ja kannustimet,
+Sourced by Supplier,Toimittaja,
+Total weightage assigned should be 100%.<br>It is {0},Kohdistetun kokonaispainon tulisi olla 100%.<br> Se on {0},
+Account {0} exists in parent company {1}.,Tili {0} on emoyhtiössä {1}.,
+"To overrule this, enable '{0}' in company {1}",Voit kumota tämän ottamalla yrityksen {0} käyttöön yrityksessä {1},
+Invalid condition expression,Virheellinen ehtolauseke,
+Please Select a Company First,Valitse ensin yritys,
+Please Select Both Company and Party Type First,Valitse ensin sekä yritys- että juhlatyyppi,
+Provide the invoice portion in percent,Anna laskutusosuus prosentteina,
+Give number of days according to prior selection,Ilmoita päivien määrä etukäteen tehdyn valinnan mukaan,
+Email Details,Sähköpostin tiedot,
+"Select a greeting for the receiver. E.g. Mr., Ms., etc.","Valitse tervehdys vastaanottimelle. Esim. Herra, rouva jne.",
+Preview Email,Esikatsele sähköpostia,
+Please select a Supplier,Valitse toimittaja,
+Supplier Lead Time (days),Toimittajan toimitusaika (päivää),
+"Home, Work, etc.","Koti, työ jne.",
+Exit Interview Held On,Lopeta haastattelu,
+Condition and formula,Kunto ja kaava,
+Sets 'Target Warehouse' in each row of the Items table.,Asettaa Kohdevarasto Kohde-taulukon jokaiselle riville.,
+Sets 'Source Warehouse' in each row of the Items table.,Asettaa Lähdevarasto Kohteet-taulukon jokaiselle riville.,
+POS Register,POS-rekisteri,
+"Can not filter based on POS Profile, if grouped by POS Profile","Ei voida suodattaa POS-profiilin perusteella, jos se on ryhmitelty POS-profiilin mukaan",
+"Can not filter based on Customer, if grouped by Customer","Ei voi suodattaa asiakkaan perusteella, jos asiakas on ryhmitelty",
+"Can not filter based on Cashier, if grouped by Cashier","Ei voi suodattaa kassan perusteella, jos se on ryhmitelty kassan mukaan",
+Payment Method,Maksutapa,
+"Can not filter based on Payment Method, if grouped by Payment Method","Ei voi suodattaa maksutavan perusteella, jos se on ryhmitelty maksutavan mukaan",
+Supplier Quotation Comparison,Toimittajien tarjousten vertailu,
+Price per Unit (Stock UOM),Yksikköhinta (varastossa UOM),
+Group by Supplier,Ryhmittele toimittajan mukaan,
+Group by Item,Ryhmittele kohteiden mukaan,
+Remember to set {field_label}. It is required by {regulation}.,Muista asettaa {field_label}. Sitä vaaditaan {asetuksessa}.,
+Enrollment Date cannot be before the Start Date of the Academic Year {0},Ilmoittautumispäivä ei voi olla aikaisempi kuin lukuvuoden aloituspäivä {0},
+Enrollment Date cannot be after the End Date of the Academic Term {0},Ilmoittautumispäivä ei voi olla lukukauden päättymispäivän jälkeen {0},
+Enrollment Date cannot be before the Start Date of the Academic Term {0},Ilmoittautumispäivä ei voi olla aikaisempi kuin lukukauden aloituspäivä {0},
+Posting future transactions are not allowed due to Immutable Ledger,Tulevien tapahtumien kirjaaminen ei ole sallittua Immutable Ledgerin vuoksi,
+Future Posting Not Allowed,Tulevaa julkaisua ei sallita,
+"To enable Capital Work in Progress Accounting, ","Jotta pääomatyö käynnissä olevaan kirjanpitoon voidaan ottaa käyttöön,",
+you must select Capital Work in Progress Account in accounts table,sinun on valittava pääomatyö käynnissä -tili tilitaulukosta,
+You can also set default CWIP account in Company {},Voit myös asettaa CWIP-oletustilin yrityksessä {},
+The Request for Quotation can be accessed by clicking on the following button,Tarjouspyyntöön pääsee napsauttamalla seuraavaa painiketta,
+Regards,Terveiset,
+Please click on the following button to set your new password,Napsauta seuraavaa painiketta asettaaksesi uuden salasanasi,
+Update Password,Päivitä salasana,
+Row #{}: Selling rate for item {} is lower than its {}. Selling {} should be atleast {},Rivi # {}: Tuotteen {} myyntihinta on matalampi kuin sen {}. Myynnin {} tulisi olla vähintään {},
+You can alternatively disable selling price validation in {} to bypass this validation.,Voit vaihtoehtoisesti poistaa myyntihinnan vahvistuksen käytöstä {} ohittaaksesi tämän vahvistuksen.,
+Invalid Selling Price,Virheellinen myyntihinta,
+Address needs to be linked to a Company. Please add a row for Company in the Links table.,Osoite on linkitettävä yritykseen. Lisää linkki-taulukkoon Yritys-rivi.,
+Company Not Linked,Yritystä ei ole linkitetty,
+Import Chart of Accounts from CSV / Excel files,Tuo tilikartta CSV / Excel-tiedostoista,
+Completed Qty cannot be greater than 'Qty to Manufacture',Toteutettu määrä ei voi olla suurempi kuin &quot;Valmistuksen määrä&quot;,
+"Row {0}: For Supplier {1}, Email Address is Required to send an email",Rivi {0}: Toimittajalle {1} sähköpostiosoite vaaditaan sähköpostin lähettämiseen,
diff --git a/erpnext/translations/fr.csv b/erpnext/translations/fr.csv
index dd72c2e..98eb619 100644
--- a/erpnext/translations/fr.csv
+++ b/erpnext/translations/fr.csv
@@ -521,7 +521,6 @@
 Chargeble,Chargeble,
 Charges are updated in Purchase Receipt against each item,Les frais sont mis à jour dans le Reçu d'Achat pour chaque article,
 "Charges will be distributed proportionately based on item qty or amount, as per your selection","Les frais seront distribués proportionnellement à la qté ou au montant de l'article, selon votre sélection",
-Chart Of Accounts,Plan comptable,
 Chart of Cost Centers,Tableau des centres de coûts,
 Check all,Cochez tout,
 Checkout,Règlement,
@@ -581,7 +580,6 @@
 Compensatory Off,Congé Compensatoire,
 Compensatory leave request days not in valid holidays,Les jours de la demande de congé compensatoire ne sont pas dans des vacances valides,
 Complaint,Plainte,
-Completed Qty can not be greater than 'Qty to Manufacture',"Qté Terminée ne peut pas être supérieure à ""Quantité de Production""",
 Completion Date,Date d'Achèvement,
 Computer,Ordinateur,
 Condition,Conditions,
@@ -2033,7 +2031,6 @@
 Please select Charge Type first,Veuillez d’abord sélectionner le Type de Facturation,
 Please select Company,Veuillez sélectionner une Société,
 Please select Company and Designation,Veuillez sélectionner la société et la désignation,
-Please select Company and Party Type first,Veuillez d’abord sélectionner une Société et le Type de Tiers,
 Please select Company and Posting Date to getting entries,Veuillez sélectionner la société et la date de comptabilisation pour obtenir les écritures,
 Please select Company first,Veuillez d’abord sélectionner une Société,
 Please select Completion Date for Completed Asset Maintenance Log,Veuillez sélectionner la date d&#39;achèvement pour le journal de maintenance des actifs terminé,
@@ -2980,7 +2977,6 @@
 The name of your company for which you are setting up this system.,Le nom de l'entreprise pour laquelle vous configurez ce système.,
 The number of shares and the share numbers are inconsistent,Le nombre d'actions dans les transactions est incohérent avec le nombre total d'actions,
 The payment gateway account in plan {0} is different from the payment gateway account in this payment request,Le compte passerelle de paiement dans le plan {0} est différent du compte passerelle de paiement dans cette requête de paiement.,
-The request for quotation can be accessed by clicking on the following link,La demande de devis peut être consultée en cliquant sur le lien suivant,
 The selected BOMs are not for the same item,Les LDMs sélectionnées ne sont pas pour le même article,
 The selected item cannot have Batch,L’article sélectionné ne peut pas avoir de Lot,
 The seller and the buyer cannot be the same,Le vendeur et l'acheteur ne peuvent pas être les mêmes,
@@ -3130,7 +3126,6 @@
 Total flexible benefit component amount {0} should not be less than max benefits {1},Le montant total de la composante de prestation flexible {0} ne doit pas être inférieur au nombre maximal de prestations {1},
 Total hours: {0},Nombre total d'heures : {0},
 Total leaves allocated is mandatory for Leave Type {0},Le nombre total de congés alloués est obligatoire pour le type de congé {0},
-Total weightage assigned should be 100%. It is {0},Le total des pondérations attribuées devrait être de 100 %. Il est {0},
 Total working hours should not be greater than max working hours {0},Le nombre total d'heures travaillées ne doit pas être supérieur à la durée maximale du travail {0},
 Total {0} ({1}),Total {0} ({1}),
 "Total {0} for all items is zero, may be you should change 'Distribute Charges Based On'","Le Total {0} pour tous les articles est nul, peut-être devriez-vous modifier ‘Distribuez les Frais sur la Base de’",
@@ -3544,7 +3539,6 @@
 Company field is required,Le champ de l'entreprise est obligatoire,
 Creating Dimensions...,Créer des dimensions ...,
 Duplicate entry against the item code {0} and manufacturer {1},Dupliquer la saisie par rapport au code article {0} et au fabricant {1},
-Import Chart Of Accounts from CSV / Excel files,Importer un graphique des comptes à partir de fichiers CSV / Excel,
 Invalid GSTIN! The input you've entered doesn't match the GSTIN format for UIN Holders or Non-Resident OIDAR Service Providers,GSTIN invalide! L'entrée que vous avez entrée ne correspond pas au format GSTIN pour les titulaires d'un UIN ou les fournisseurs de services OIDAR non résidents,
 Invoice Grand Total,Total général de la facture,
 Last carbon check date cannot be a future date,La date du dernier bilan carbone ne peut pas être une date future,
@@ -3921,7 +3915,6 @@
 Plaid public token error,Erreur de jeton public Plaid,
 Plaid transactions sync error,Erreur de synchronisation des transactions plaid,
 Please check the error log for details about the import errors,Veuillez consulter le journal des erreurs pour plus de détails sur les erreurs d'importation.,
-Please click on the following link to set your new password,Veuillez cliquer sur le lien suivant pour définir votre nouveau mot de passe,
 Please create <b>DATEV Settings</b> for Company <b>{}</b>.,Veuillez créer les <b>paramètres DATEV</b> pour l'entreprise <b>{}</b> .,
 Please create adjustment Journal Entry for amount {0} ,Veuillez créer une écriture de journal d&#39;ajustement pour le montant {0},
 Please do not create more than 500 items at a time,Ne créez pas plus de 500 objets à la fois.,
@@ -3997,6 +3990,7 @@
 Release date must be in the future,La date de sortie doit être dans le futur,
 Relieving Date must be greater than or equal to Date of Joining,La date de libération doit être supérieure ou égale à la date d'adhésion,
 Rename,Renommer,
+Rename Not Allowed,Renommer non autorisé,
 Repayment Method is mandatory for term loans,La méthode de remboursement est obligatoire pour les prêts à terme,
 Repayment Start Date is mandatory for term loans,La date de début de remboursement est obligatoire pour les prêts à terme,
 Report Item,Élément de rapport,
@@ -4043,7 +4037,6 @@
 Select All,Sélectionner Tout,
 Select Difference Account,Sélectionnez compte différentiel,
 Select a Default Priority.,Sélectionnez une priorité par défaut.,
-Select a Supplier from the Default Supplier List of the items below.,Sélectionnez un fournisseur dans la liste des fournisseurs par défaut des éléments ci-dessous.,
 Select a company,Sélectionnez une entreprise,
 Select finance book for the item {0} at row {1},Sélectionnez le livre de financement pour l&#39;élément {0} à la ligne {1}.,
 Select only one Priority as Default.,Sélectionnez une seule priorité par défaut.,
@@ -4247,7 +4240,6 @@
 Actual ,Réel,
 Add to cart,Ajouter au Panier,
 Budget,Budget,
-Chart Of Accounts Importer,Importateur de plan comptable,
 Chart of Accounts,Plan comptable,
 Customer database.,Base de données clients.,
 Days Since Last order,Jours depuis la dernière commande,
@@ -4546,7 +4538,6 @@
 Check Supplier Invoice Number Uniqueness,Vérifiez l'Unicité du Numéro de Facture du Fournisseur,
 Make Payment via Journal Entry,Effectuer un Paiement par une Écriture de Journal,
 Unlink Payment on Cancellation of Invoice,Délier Paiement à l'Annulation de la Facture,
-Unlink Advance Payment on Cancelation of Order,Dissocier le paiement anticipé lors de l'annulation d'une commande,
 Book Asset Depreciation Entry Automatically,Comptabiliser les Entrées de Dépréciation d'Actifs Automatiquement,
 Automatically Add Taxes and Charges from Item Tax Template,Ajouter automatiquement des taxes et des frais à partir du modèle de taxe à la pièce,
 Automatically Fetch Payment Terms,Récupérer automatiquement les conditions de paiement,
@@ -4940,7 +4931,6 @@
 POS Customer Group,Groupe Clients PDV,
 POS Field,Champ POS,
 POS Item Group,Groupe d'Articles PDV,
-[Select],[Choisir],
 Company Address,Adresse de la Société,
 Update Stock,Mettre à Jour le Stock,
 Ignore Pricing Rule,Ignorez Règle de Prix,
@@ -6481,7 +6471,6 @@
 Appraisal Template,Modèle d'évaluation,
 For Employee Name,Nom de l'Employé,
 Goals,Objectifs,
-Calculate Total Score,Calculer le Résultat Total,
 Total Score (Out of 5),Score Total (sur 5),
 "Any other remarks, noteworthy effort that should go in the records.","Toute autre remarque, effort remarquable qui devrait aller dans les dossiers.",
 Appraisal Goal,Objectif d'Estimation,
@@ -6599,11 +6588,6 @@
 Reason for Leaving,Raison du Départ,
 Leave Encashed?,Laisser Encaissé ?,
 Encashment Date,Date de l'Encaissement,
-Exit Interview Details,Entretient de Départ,
-Held On,Tenu le,
-Reason for Resignation,Raison de la Démission,
-Better Prospects,Meilleures Perspectives,
-Health Concerns,Problèmes de Santé,
 New Workplace,Nouveau Lieu de Travail,
 HR-EAD-.YYYY.-,HR-EAD-.YYYY.-,
 Returned Amount,Montant retourné,
@@ -8239,9 +8223,6 @@
 Manufacturers used in Items,Fabricants utilisés dans les Articles,
 Limited to 12 characters,Limité à 12 caractères,
 MAT-MR-.YYYY.-,MAT-MR-YYYY.-,
-Set Warehouse,Définir l&#39;entrepôt,
-Sets 'For Warehouse' in each row of the Items table.,Définit «Pour l&#39;entrepôt» dans chaque ligne de la table Articles.,
-Requested For,Demandé Pour,
 Partially Ordered,Partiellement commandé,
 Transferred,Transféré,
 % Ordered,% Commandé,
@@ -8690,8 +8671,6 @@
 Select warehouse for material requests,Sélectionnez l&#39;entrepôt pour les demandes de matériel,
 Transfer Materials For Warehouse {0},Transférer des matériaux pour l&#39;entrepôt {0},
 Production Plan Material Request Warehouse,Entrepôt de demande de matériel du plan de production,
-Set From Warehouse,Définir de l&#39;entrepôt,
-Source Warehouse (Material Transfer),Entrepôt d&#39;origine (transfert de matériel),
 Sets 'Source Warehouse' in each row of the items table.,Définit «Entrepôt source» dans chaque ligne de la table des éléments.,
 Sets 'Target Warehouse' in each row of the items table.,Définit «Entrepôt cible» dans chaque ligne de la table des articles.,
 Show Cancelled Entries,Afficher les entrées annulées,
@@ -9157,7 +9136,6 @@
 Is Income Tax Component,Est un élément de l&#39;impôt sur le revenu,
 Component properties and references ,Propriétés et références des composants,
 Additional Salary ,Salaire supplémentaire,
-Condtion and formula,Condition et formule,
 Unmarked days,Jours non marqués,
 Absent Days,Jours d&#39;absence,
 Conditions and Formula variable and example,Conditions et variable de formule et exemple,
@@ -9444,7 +9422,6 @@
 Please check your Plaid client ID and secret values,Veuillez vérifier votre identifiant client Plaid et vos valeurs secrètes,
 Bank transaction creation error,Erreur de création de transaction bancaire,
 Unit of Measurement,Unité de mesure,
-Row #{}: Selling rate for item {} is lower than its {}. Selling rate should be atleast {},Ligne n ° {}: le taux de vente de l&#39;article {} est inférieur à son {}. Le taux de vente doit être d&#39;au moins {},
 Fiscal Year {0} Does Not Exist,L&#39;exercice budgétaire {0} n&#39;existe pas,
 Row # {0}: Returned Item {1} does not exist in {2} {3},Ligne n ° {0}: l&#39;élément renvoyé {1} n&#39;existe pas dans {2} {3},
 Valuation type charges can not be marked as Inclusive,Les frais de type d&#39;évaluation ne peuvent pas être marqués comme inclusifs,
@@ -9598,8 +9575,60 @@
 Response Time for {0} priority in row {1} can't be greater than Resolution Time.,Le temps de réponse pour la {0} priorité dans la ligne {1} ne peut pas être supérieur au temps de résolution.,
 {0} is not enabled in {1},{0} n&#39;est pas activé dans {1},
 Group by Material Request,Regrouper par demande de matériel,
-"Row {0}: For Supplier {0}, Email Address is Required to Send Email","Ligne {0}: pour le fournisseur {0}, l&#39;adresse e-mail est requise pour envoyer un e-mail",
 Email Sent to Supplier {0},E-mail envoyé au fournisseur {0},
 "The Access to Request for Quotation From Portal is Disabled. To Allow Access, Enable it in Portal Settings.","L&#39;accès à la demande de devis du portail est désactivé. Pour autoriser l&#39;accès, activez-le dans les paramètres du portail.",
 Supplier Quotation {0} Created,Devis fournisseur {0} créé,
 Valid till Date cannot be before Transaction Date,La date de validité ne peut pas être antérieure à la date de transaction,
+Unlink Advance Payment on Cancellation of Order,Dissocier le paiement anticipé lors de l&#39;annulation de la commande,
+"Simple Python Expression, Example: territory != 'All Territories'","Expression Python simple, exemple: territoire! = &#39;Tous les territoires&#39;",
+Sales Contributions and Incentives,Contributions et incitations aux ventes,
+Sourced by Supplier,Fourni par le fournisseur,
+Total weightage assigned should be 100%.<br>It is {0},Le poids total attribué doit être de 100%.<br> C&#39;est {0},
+Account {0} exists in parent company {1}.,Le compte {0} existe dans la société mère {1}.,
+"To overrule this, enable '{0}' in company {1}","Pour contourner ce problème, activez «{0}» dans l&#39;entreprise {1}",
+Invalid condition expression,Expression de condition non valide,
+Please Select a Company First,Veuillez d&#39;abord sélectionner une entreprise,
+Please Select Both Company and Party Type First,Veuillez d&#39;abord sélectionner à la fois la société et le type de partie,
+Provide the invoice portion in percent,Fournissez la partie de la facture en pourcentage,
+Give number of days according to prior selection,Donnez le nombre de jours selon la sélection préalable,
+Email Details,Détails de l&#39;e-mail,
+"Select a greeting for the receiver. E.g. Mr., Ms., etc.","Sélectionnez un message d&#39;accueil pour le destinataire. Par exemple, M., Mme, etc.",
+Preview Email,Aperçu de l&#39;e-mail,
+Please select a Supplier,Veuillez sélectionner un fournisseur,
+Supplier Lead Time (days),Délai fournisseur (jours),
+"Home, Work, etc.","Domicile, travail, etc.",
+Exit Interview Held On,Entretien de sortie tenu le,
+Condition and formula,Condition et formule,
+Sets 'Target Warehouse' in each row of the Items table.,Définit «Entrepôt cible» dans chaque ligne de la table Articles.,
+Sets 'Source Warehouse' in each row of the Items table.,Définit «Entrepôt source» dans chaque ligne de la table Articles.,
+POS Register,Registre POS,
+"Can not filter based on POS Profile, if grouped by POS Profile","Impossible de filtrer en fonction du profil de point de vente, s&#39;il est regroupé par profil de point de vente",
+"Can not filter based on Customer, if grouped by Customer","Impossible de filtrer en fonction du client, s&#39;il est regroupé par client",
+"Can not filter based on Cashier, if grouped by Cashier","Impossible de filtrer en fonction du caissier, s&#39;il est regroupé par caissier",
+Payment Method,Mode de paiement,
+"Can not filter based on Payment Method, if grouped by Payment Method","Impossible de filtrer en fonction du mode de paiement, s&#39;il est regroupé par mode de paiement",
+Supplier Quotation Comparison,Comparaison des devis fournisseurs,
+Price per Unit (Stock UOM),Prix unitaire (Stock UdM),
+Group by Supplier,Regrouper par fournisseur,
+Group by Item,Grouper par article,
+Remember to set {field_label}. It is required by {regulation}.,N&#39;oubliez pas de définir {field_label}. Il est requis par {règlement}.,
+Enrollment Date cannot be before the Start Date of the Academic Year {0},La date d&#39;inscription ne peut pas être antérieure à la date de début de l&#39;année universitaire {0},
+Enrollment Date cannot be after the End Date of the Academic Term {0},La date d&#39;inscription ne peut pas être postérieure à la date de fin du trimestre universitaire {0},
+Enrollment Date cannot be before the Start Date of the Academic Term {0},La date d&#39;inscription ne peut pas être antérieure à la date de début de la session universitaire {0},
+Posting future transactions are not allowed due to Immutable Ledger,La comptabilisation des transactions futures n&#39;est pas autorisée en raison du grand livre immuable,
+Future Posting Not Allowed,Publication future non autorisée,
+"To enable Capital Work in Progress Accounting, ","Pour activer la comptabilité des immobilisations en cours,",
+you must select Capital Work in Progress Account in accounts table,vous devez sélectionner le compte des travaux d&#39;immobilisations en cours dans le tableau des comptes,
+You can also set default CWIP account in Company {},Vous pouvez également définir le compte CWIP par défaut dans Entreprise {},
+The Request for Quotation can be accessed by clicking on the following button,La demande de devis est accessible en cliquant sur le bouton suivant,
+Regards,Cordialement,
+Please click on the following button to set your new password,Veuillez cliquer sur le bouton suivant pour définir votre nouveau mot de passe,
+Update Password,Mettre à jour le mot de passe,
+Row #{}: Selling rate for item {} is lower than its {}. Selling {} should be atleast {},Ligne n ° {}: le taux de vente de l&#39;article {} est inférieur à son {}. La vente {} doit être au moins {},
+You can alternatively disable selling price validation in {} to bypass this validation.,Vous pouvez également désactiver la validation du prix de vente dans {} pour contourner cette validation.,
+Invalid Selling Price,Prix de vente invalide,
+Address needs to be linked to a Company. Please add a row for Company in the Links table.,L&#39;adresse doit être liée à une entreprise. Veuillez ajouter une ligne pour Entreprise dans le tableau Liens.,
+Company Not Linked,Entreprise non liée,
+Import Chart of Accounts from CSV / Excel files,Importer un plan comptable à partir de fichiers CSV / Excel,
+Completed Qty cannot be greater than 'Qty to Manufacture',La quantité terminée ne peut pas être supérieure à la `` quantité à fabriquer &#39;&#39;,
+"Row {0}: For Supplier {1}, Email Address is Required to send an email","Ligne {0}: pour le fournisseur {1}, l&#39;adresse e-mail est obligatoire pour envoyer un e-mail",
diff --git a/erpnext/translations/gu.csv b/erpnext/translations/gu.csv
index 452935a..bb29b78 100644
--- a/erpnext/translations/gu.csv
+++ b/erpnext/translations/gu.csv
@@ -521,7 +521,6 @@
 Chargeble,ચાર્જબલ,
 Charges are updated in Purchase Receipt against each item,સમાયોજિત દરેક વસ્તુ સામે ખરીદી રસીદ અપડેટ કરવામાં આવે છે,
 "Charges will be distributed proportionately based on item qty or amount, as per your selection","સમાયોજિત પ્રમાણમાં તમારી પસંદગી મુજબ, વસ્તુ Qty અથવા રકમ પર આધારિત વિતરણ કરવામાં આવશે",
-Chart Of Accounts,એકાઉન્ટ્સ ઓફ ચાર્ટ,
 Chart of Cost Centers,કિંમત કેન્દ્રો ચાર્ટ,
 Check all,બધા તપાસો,
 Checkout,ચેકઆઉટ,
@@ -581,7 +580,6 @@
 Compensatory Off,વળતર બંધ,
 Compensatory leave request days not in valid holidays,માન્ય રજાઓના દિવસોમાં વળતરની રજાની વિનંતીઓ,
 Complaint,ફરિયાદ,
-Completed Qty can not be greater than 'Qty to Manufacture',કરતાં &#39;Qty ઉત્પાદન&#39; પૂર્ણ Qty વધારે ન હોઈ શકે,
 Completion Date,પૂર્ણાહુતિ તારીખ્,
 Computer,કમ્પ્યુટર,
 Condition,કન્ડિશન,
@@ -2033,7 +2031,6 @@
 Please select Charge Type first,પ્રથમ ચાર્જ પ્રકાર પસંદ કરો,
 Please select Company,કંપની પસંદ કરો,
 Please select Company and Designation,કંપની અને હોદ્દો પસંદ કરો,
-Please select Company and Party Type first,પ્રથમ કંપની અને પાર્ટી પ્રકાર પસંદ કરો,
 Please select Company and Posting Date to getting entries,પ્રવેશ મેળવવા માટેની કંપની અને પોસ્ટિંગ તારીખ પસંદ કરો,
 Please select Company first,પ્રથમ કંપની પસંદ કરો,
 Please select Completion Date for Completed Asset Maintenance Log,પૂર્ણ સંપત્તિ જાળવણી પ્રવેશ માટે સમાપ્તિ તારીખ પસંદ કરો,
@@ -2980,7 +2977,6 @@
 The name of your company for which you are setting up this system.,તમારી કંપનીના નામ કે જેના માટે તમે આ સિસ્ટમ સુયોજિત કરી રહ્યા હોય.,
 The number of shares and the share numbers are inconsistent,શેર્સની સંખ્યા અને શેરની સંખ્યા અસંગત છે,
 The payment gateway account in plan {0} is different from the payment gateway account in this payment request,પ્લાન {0} માં ચુકવણી ગેટવે એકાઉન્ટ ચુકવણીની વિનંતીમાં ચુકવણી ગેટવે એકાઉન્ટથી અલગ છે,
-The request for quotation can be accessed by clicking on the following link,અવતરણ માટે વિનંતી નીચેની લિંક પર ક્લિક કરીને વાપરી શકાય છે,
 The selected BOMs are not for the same item,પસંદ BOMs જ વસ્તુ માટે નથી,
 The selected item cannot have Batch,પસંદ કરેલ વસ્તુ બેચ હોઈ શકે નહિં,
 The seller and the buyer cannot be the same,વેચનાર અને ખરીદનાર તે જ ન હોઈ શકે,
@@ -3130,7 +3126,6 @@
 Total flexible benefit component amount {0} should not be less than max benefits {1},કુલ ફ્લેક્સિબલ લાભ ઘટક રકમ {0} મહત્તમ લાભ કરતાં ઓછી હોવી જોઈએ નહીં {1},
 Total hours: {0},કુલ સમય: {0},
 Total leaves allocated is mandatory for Leave Type {0},રવાના પ્રકાર {0} માટે ફાળવેલ કુલ પાંદડા ફરજિયાત છે,
-Total weightage assigned should be 100%. It is {0},100% પ્રયત્ન કરીશું સોંપાયેલ કુલ વેઇટેજ. તે {0},
 Total working hours should not be greater than max working hours {0},કુલ કામના કલાકો મેક્સ કામના કલાકો કરતાં વધારે ન હોવી જોઈએ {0},
 Total {0} ({1}),કુલ {0} ({1}),
 "Total {0} for all items is zero, may be you should change 'Distribute Charges Based On'","કુલ {0} બધી વસ્તુઓ માટે શૂન્ય છે, તો તમે &#39;પર આધારિત ચાર્જિસ વિતરિત&#39; બદલવા જોઈએ કરી શકે",
@@ -3544,7 +3539,6 @@
 Company field is required,કંપની ક્ષેત્ર આવશ્યક છે,
 Creating Dimensions...,પરિમાણો બનાવી રહ્યાં છે ...,
 Duplicate entry against the item code {0} and manufacturer {1},આઇટમ કોડ {0} અને ઉત્પાદક {1} વિરુદ્ધ ડુપ્લિકેટ એન્ટ્રી,
-Import Chart Of Accounts from CSV / Excel files,સીએસવી / એક્સેલ ફાઇલોથી એકાઉન્ટ્સનો ચાર્ટ આયાત કરો,
 Invalid GSTIN! The input you've entered doesn't match the GSTIN format for UIN Holders or Non-Resident OIDAR Service Providers,અમાન્ય જીએસટીઆઈએન! તમે દાખલ કરેલ ઇનપુટ યુઆઈએન ધારકો અથવા બિન-નિવાસી OIDAR સેવા પ્રદાતાઓ માટેના GSTIN ફોર્મેટ સાથે મેળ ખાતું નથી,
 Invoice Grand Total,ભરતિયું ગ્રાન્ડ કુલ,
 Last carbon check date cannot be a future date,છેલ્લી કાર્બન ચેક તારીખ ભવિષ્યની તારીખ હોઈ શકતી નથી,
@@ -3921,7 +3915,6 @@
 Plaid public token error,પ્લેડ સાર્વજનિક ટોકન ભૂલ,
 Plaid transactions sync error,પ્લેઇડ ટ્રાન્ઝેક્શન સમન્વયન ભૂલ,
 Please check the error log for details about the import errors,કૃપા કરીને આયાત ભૂલો વિશેની વિગતો માટે ભૂલ લોગને તપાસો,
-Please click on the following link to set your new password,તમારો નવો પાસવર્ડ સુયોજિત કરવા માટે નીચેની લિંક પર ક્લિક કરો,
 Please create <b>DATEV Settings</b> for Company <b>{}</b>.,કૃપા કરીને કંપની <b>{</b> <b>for</b> માટે <b>DATEV સેટિંગ્સ</b> બનાવો.,
 Please create adjustment Journal Entry for amount {0} ,કૃપા કરી રકમ for 0 for માટે એડજસ્ટમેન્ટ જર્નલ એન્ટ્રી બનાવો,
 Please do not create more than 500 items at a time,કૃપા કરીને એક સમયે 500 થી વધુ વસ્તુઓ બનાવશો નહીં,
@@ -3997,6 +3990,7 @@
 Release date must be in the future,પ્રકાશન તારીખ ભવિષ્યમાં હોવી આવશ્યક છે,
 Relieving Date must be greater than or equal to Date of Joining,રાહત આપવાની તારીખ જોડાવાની તારીખથી મોટી અથવા તેના જેટલી હોવી જોઈએ,
 Rename,નામ બદલો,
+Rename Not Allowed,નામ બદલી મંજૂરી નથી,
 Repayment Method is mandatory for term loans,ટર્મ લોન માટે ચુકવણીની પદ્ધતિ ફરજિયાત છે,
 Repayment Start Date is mandatory for term loans,ટર્મ લોન માટે ચુકવણીની શરૂઆત તારીખ ફરજિયાત છે,
 Report Item,રિપોર્ટ આઇટમ,
@@ -4043,7 +4037,6 @@
 Select All,બધા પસંદ કરો,
 Select Difference Account,ડિફરન્સ એકાઉન્ટ પસંદ કરો,
 Select a Default Priority.,ડિફોલ્ટ પ્રાધાન્યતા પસંદ કરો.,
-Select a Supplier from the Default Supplier List of the items below.,નીચેની આઇટમ્સની ડિફોલ્ટ સપ્લાયર સૂચિમાંથી સપ્લાયર પસંદ કરો.,
 Select a company,કોઈ કંપની પસંદ કરો,
 Select finance book for the item {0} at row {1},પંક્તિ {1} પર આઇટમ {0} માટે ફાઇનાન્સ બુક પસંદ કરો,
 Select only one Priority as Default.,ડિફaultલ્ટ તરીકે ફક્ત એક પ્રાધાન્યતા પસંદ કરો.,
@@ -4247,7 +4240,6 @@
 Actual ,વાસ્તવિક,
 Add to cart,સૂચી માં સામેલ કરો,
 Budget,બજેટ,
-Chart Of Accounts Importer,એકાઉન્ટ્સ આયાતકારનો ચાર્ટ,
 Chart of Accounts,હિસાબનો ચાર્ટ,
 Customer database.,ગ્રાહક ડેટાબેઝ.,
 Days Since Last order,છેલ્લે ઓર્ડર સુધીનાં દિવસો,
@@ -4546,7 +4538,6 @@
 Check Supplier Invoice Number Uniqueness,ચેક પુરવઠોકર્તા ભરતિયું નંબર વિશિષ્ટતા,
 Make Payment via Journal Entry,જર્નલ પ્રવેશ મારફતે ચુકવણી બનાવો,
 Unlink Payment on Cancellation of Invoice,ભરતિયું રદ પર ચુકવણી નાપસંદ,
-Unlink Advance Payment on Cancelation of Order,હુકમ રદ પર અનલિંક એડવાન્સ ચુકવણી,
 Book Asset Depreciation Entry Automatically,બુક એસેટ ઘસારો એન્ટ્રી આપમેળે,
 Automatically Add Taxes and Charges from Item Tax Template,આઇટમ ટેક્સ Templateાંચોથી આપમેળે કર અને ચાર્જ ઉમેરો,
 Automatically Fetch Payment Terms,આપમેળે ચુકવણીની શરતો મેળવો,
@@ -4940,7 +4931,6 @@
 POS Customer Group,POS ગ્રાહક જૂથ,
 POS Field,પોસ ક્ષેત્ર,
 POS Item Group,POS વસ્તુ ગ્રુપ,
-[Select],[પસંદ કરો],
 Company Address,કંપનીનું સરનામું,
 Update Stock,સુધારા સ્ટોક,
 Ignore Pricing Rule,પ્રાઇસીંગ નિયમ અવગણો,
@@ -6481,7 +6471,6 @@
 Appraisal Template,મૂલ્યાંકન ઢાંચો,
 For Employee Name,કર્મચારીનું નામ માટે,
 Goals,લક્ષ્યાંક,
-Calculate Total Score,કુલ સ્કોર ગણતરી,
 Total Score (Out of 5),(5) કુલ સ્કોર,
 "Any other remarks, noteworthy effort that should go in the records.","કોઈપણ અન્ય ટીકા, રેકોર્ડ જવા જોઈએ કે નોંધપાત્ર પ્રયાસ.",
 Appraisal Goal,મૂલ્યાંકન ગોલ,
@@ -6599,11 +6588,6 @@
 Reason for Leaving,છોડીને માટે કારણ,
 Leave Encashed?,વટાવી છોડી?,
 Encashment Date,એન્કેશમેન્ટ તારીખ,
-Exit Interview Details,બહાર નીકળો મુલાકાત વિગતો,
-Held On,આયોજન પર,
-Reason for Resignation,રાજીનામાની કારણ,
-Better Prospects,સારી સંભાવના,
-Health Concerns,આરોગ્ય ચિંતા,
 New Workplace,ન્યૂ નોકરીના સ્થળે,
 HR-EAD-.YYYY.-,એચઆર-ઇએડી-. યેવાયવાય.-,
 Returned Amount,પરત રકમ,
@@ -8239,9 +8223,6 @@
 Manufacturers used in Items,વસ્તુઓ વપરાય ઉત્પાદકો,
 Limited to 12 characters,12 અક્ષરો સુધી મર્યાદિત,
 MAT-MR-.YYYY.-,એમએટી- એમઆર-યુ.વાયવાયવાય.-,
-Set Warehouse,વેરહાઉસ સેટ કરો,
-Sets 'For Warehouse' in each row of the Items table.,આઇટમ કોષ્ટકની દરેક પંક્તિમાં &#39;વેરહાઉસ માટે&#39; સેટ કરો.,
-Requested For,વિનંતી,
 Partially Ordered,આંશિક રીતે આદેશ આપ્યો,
 Transferred,પર સ્થાનાંતરિત કરવામાં આવી,
 % Ordered,% આદેશ આપ્યો,
@@ -8690,8 +8671,6 @@
 Select warehouse for material requests,સામગ્રી વિનંતીઓ માટે વેરહાઉસ પસંદ કરો,
 Transfer Materials For Warehouse {0},વેરહાઉસ Material 0 For માટે સામગ્રી સ્થાનાંતરિત કરો,
 Production Plan Material Request Warehouse,ઉત્પાદન યોજના સામગ્રી વિનંતી વેરહાઉસ,
-Set From Warehouse,વેરહાઉસમાંથી સેટ કરો,
-Source Warehouse (Material Transfer),સોર્સ વેરહાઉસ (મટીરિયલ ટ્રાન્સફર),
 Sets 'Source Warehouse' in each row of the items table.,આઇટમ્સ કોષ્ટકની દરેક પંક્તિમાં &#39;સોર્સ વેરહાઉસ&#39; સેટ કરો.,
 Sets 'Target Warehouse' in each row of the items table.,આઇટમ્સના ટેબલની દરેક પંક્તિમાં &#39;લક્ષ્ય વેરહાઉસ&#39; સેટ કરો.,
 Show Cancelled Entries,રદ કરેલ પ્રવેશો બતાવો,
@@ -9157,7 +9136,6 @@
 Is Income Tax Component,આવકવેરાના ભાગ છે,
 Component properties and references ,ઘટક ગુણધર્મો અને સંદર્ભો,
 Additional Salary ,વધારાના પગાર,
-Condtion and formula,સ્થિતિ અને સૂત્ર,
 Unmarked days,અંકિત દિવસો,
 Absent Days,ગેરહાજર દિવસો,
 Conditions and Formula variable and example,શરતો અને ફોર્મ્યુલા ચલ અને ઉદાહરણ,
@@ -9444,7 +9422,6 @@
 Please check your Plaid client ID and secret values,કૃપા કરી તમારી પ્લેઇડ ક્લાયંટ આઈડી અને ગુપ્ત મૂલ્યો તપાસો,
 Bank transaction creation error,બેંક વ્યવહાર બનાવવાની ભૂલ,
 Unit of Measurement,માપન એકમ,
-Row #{}: Selling rate for item {} is lower than its {}. Selling rate should be atleast {},પંક્તિ # {}: આઇટમ for for માટે વેચવાનો દર તેના {than કરતા ઓછો છે. વેચવાનો દર ઓછામાં ઓછો હોવો જોઈએ}},
 Fiscal Year {0} Does Not Exist,નાણાકીય વર્ષ {0} અસ્તિત્વમાં નથી,
 Row # {0}: Returned Item {1} does not exist in {2} {3},પંક્તિ # {0}: પરત કરેલ આઇટમ {1 {{2} {3 in માં અસ્તિત્વમાં નથી,
 Valuation type charges can not be marked as Inclusive,મૂલ્ય પ્રકારનાં ચાર્જને સમાવિષ્ટ તરીકે ચિહ્નિત કરી શકાતા નથી,
@@ -9598,8 +9575,60 @@
 Response Time for {0} priority in row {1} can't be greater than Resolution Time.,Row 0 row પંક્તિમાં અગ્રતા માટેનો પ્રતિસાદ સમય {1 Time રિઝોલ્યુશન સમય કરતા વધુ હોઈ શકતો નથી.,
 {0} is not enabled in {1},{0} {1} માં સક્ષમ નથી,
 Group by Material Request,સામગ્રી વિનંતી દ્વારા જૂથ,
-"Row {0}: For Supplier {0}, Email Address is Required to Send Email","પંક્તિ {0}: સપ્લાયર {0} માટે, ઇમેઇલ મોકલવા માટે ઇમેઇલ સરનામું આવશ્યક છે",
 Email Sent to Supplier {0},સપ્લાયર Supplier 0} ને મોકલો ઇમેઇલ,
 "The Access to Request for Quotation From Portal is Disabled. To Allow Access, Enable it in Portal Settings.","પોર્ટલથી અવતરણ માટેની વિનંતીની Disક્સેસ અક્ષમ છે. Allક્સેસને મંજૂરી આપવા માટે, તેને પોર્ટલ સેટિંગ્સમાં સક્ષમ કરો.",
 Supplier Quotation {0} Created,સપ્લાયર અવતરણ {0. બનાવ્યું,
 Valid till Date cannot be before Transaction Date,માન્ય તારીખ તારીખ ટ્રાંઝેક્શનની તારીખ પહેલાંની હોઈ શકતી નથી,
+Unlink Advance Payment on Cancellation of Order,ઓર્ડર રદ કરવા પર અનલિંક એડવાન્સ ચુકવણી,
+"Simple Python Expression, Example: territory != 'All Territories'","સરળ પાયથોન અભિવ્યક્તિ, ઉદાહરણ: પ્રદેશ! = &#39;બધા પ્રદેશો&#39;",
+Sales Contributions and Incentives,વેચાણ ફાળો અને પ્રોત્સાહનો,
+Sourced by Supplier,સપ્લાયર દ્વારા સોર્ટેડ,
+Total weightage assigned should be 100%.<br>It is {0},સોંપાયેલું કુલ વજન 100% હોવું જોઈએ.<br> તે {0} છે,
+Account {0} exists in parent company {1}.,એકાઉન્ટ {0 parent પેરેંટ કંપની} 1} માં અસ્તિત્વમાં છે.,
+"To overrule this, enable '{0}' in company {1}","તેને ઉથલાવવા માટે, કંપની {1} માં &#39;{0}&#39; સક્ષમ કરો.",
+Invalid condition expression,અમાન્ય શરત અભિવ્યક્તિ,
+Please Select a Company First,કૃપા કરીને પહેલા કોઈ કંપની પસંદ કરો,
+Please Select Both Company and Party Type First,કૃપા કરીને કંપની અને પાર્ટી પ્રકાર બંને પસંદ કરો,
+Provide the invoice portion in percent,ટકામાં ભરતિયું ભાગ પ્રદાન કરો,
+Give number of days according to prior selection,પૂર્વ પસંદગી મુજબ દિવસોની સંખ્યા આપો,
+Email Details,ઇમેઇલ વિગતો,
+"Select a greeting for the receiver. E.g. Mr., Ms., etc.","પ્રાપ્તકર્તા માટે શુભેચ્છા પસંદ કરો. દા.ત. શ્રી, કુ., વગેરે.",
+Preview Email,પૂર્વાવલોકન ઇમેઇલ,
+Please select a Supplier,કૃપા કરીને કોઈ સપ્લાયર પસંદ કરો,
+Supplier Lead Time (days),સપ્લાયર લીડ સમય (દિવસ),
+"Home, Work, etc.","ઘર, કાર્ય, વગેરે.",
+Exit Interview Held On,બહાર નીકળો ઇન્ટરવ્યુ,
+Condition and formula,સ્થિતિ અને સૂત્ર,
+Sets 'Target Warehouse' in each row of the Items table.,આઇટમ કોષ્ટકની દરેક પંક્તિમાં &#39;લક્ષ્ય વેરહાઉસ&#39; સેટ કરો.,
+Sets 'Source Warehouse' in each row of the Items table.,આઇટમ કોષ્ટકની દરેક પંક્તિમાં &#39;સોર્સ વેરહાઉસ&#39; સેટ કરો.,
+POS Register,પોસ નોંધણી,
+"Can not filter based on POS Profile, if grouped by POS Profile","જો પીઓએસ પ્રોફાઇલ દ્વારા જૂથ થયેલ હોય, તો પીઓએસ પ્રોફાઇલના આધારે ફિલ્ટર કરી શકાતું નથી",
+"Can not filter based on Customer, if grouped by Customer","જો ગ્રાહક દ્વારા જૂથ થયેલ હોય, તો ગ્રાહકના આધારે ફિલ્ટર કરી શકતા નથી",
+"Can not filter based on Cashier, if grouped by Cashier","જો કેશિયર દ્વારા જૂથ થયેલ હોય, તો કેશિયરના આધારે ફિલ્ટર કરી શકતા નથી",
+Payment Method,ચુકવણી પદ્ધતિ,
+"Can not filter based on Payment Method, if grouped by Payment Method","જો ચુકવણી પદ્ધતિ દ્વારા જૂથ થયેલ હોય, તો ચુકવણી પદ્ધતિના આધારે ફિલ્ટર કરી શકાતું નથી",
+Supplier Quotation Comparison,સપ્લાયર અવતરણ સરખામણી,
+Price per Unit (Stock UOM),યુનિટ દીઠ ભાવ (સ્ટોક યુઓએમ),
+Group by Supplier,સપ્લાયર દ્વારા જૂથ,
+Group by Item,આઇટમ દ્વારા જૂથ,
+Remember to set {field_label}. It is required by {regulation}.,{ફીલ્ડ_લેબલ set સેટ કરવાનું યાદ રાખો. તે {નિયમન by દ્વારા આવશ્યક છે.,
+Enrollment Date cannot be before the Start Date of the Academic Year {0},નોંધણી તારીખ શૈક્ષણિક વર્ષ Date 0} ની શરૂઆતની તારીખની પહેલાં હોઇ શકે નહીં,
+Enrollment Date cannot be after the End Date of the Academic Term {0},નોંધણી તારીખ શૈક્ષણિક મુદતની સમાપ્તિ તારીખ be 0 after પછીની હોઈ શકતી નથી,
+Enrollment Date cannot be before the Start Date of the Academic Term {0},નોંધણી તારીખ શૈક્ષણિક મુદતની પ્રારંભ તારીખ before 0 before પહેલાંની હોઈ શકતી નથી,
+Posting future transactions are not allowed due to Immutable Ledger,અનિયમિત લેજરને કારણે પોસ્ટિંગ ભવિષ્યના વ્યવહારોની મંજૂરી નથી,
+Future Posting Not Allowed,ભાવિ પોસ્ટિંગની મંજૂરી નથી,
+"To enable Capital Work in Progress Accounting, ","પ્રગતિ એકાઉન્ટિંગમાં કેપિટલ વર્કને સક્ષમ કરવા માટે,",
+you must select Capital Work in Progress Account in accounts table,તમારે એકાઉન્ટ્સ ટેબલમાં પ્રગતિ ખાતામાં મૂડી કાર્ય પસંદ કરવું આવશ્યક છે,
+You can also set default CWIP account in Company {},તમે કંપની default in માં ડિફોલ્ટ CWIP એકાઉન્ટ પણ સેટ કરી શકો છો.,
+The Request for Quotation can be accessed by clicking on the following button,વિનંતી માટેની વિનંતી નીચેના બટન પર ક્લિક કરીને .ક્સેસ કરી શકાય છે,
+Regards,સાદર,
+Please click on the following button to set your new password,કૃપા કરીને તમારો નવો પાસવર્ડ સેટ કરવા માટે નીચેના બટન પર ક્લિક કરો,
+Update Password,પાસવર્ડ અપડેટ કરો,
+Row #{}: Selling rate for item {} is lower than its {}. Selling {} should be atleast {},પંક્તિ # {}: આઇટમ for for માટે વેચવાનો દર તેના {than કરતા ઓછો છે. {Lling નું વેચાણ ઓછામાં ઓછું હોવું જોઈએ {},
+You can alternatively disable selling price validation in {} to bypass this validation.,આ માન્યતાને બાયપાસ કરવા માટે તમે વૈકલ્પિક રૂપે વેચાણ મૂલ્ય માન્યતાને {in માં અક્ષમ કરી શકો છો.,
+Invalid Selling Price,અમાન્ય વેચાણ કિંમત,
+Address needs to be linked to a Company. Please add a row for Company in the Links table.,સરનામાંને કંપની સાથે જોડવાની જરૂર છે. કૃપા કરીને લિંક્સ કોષ્ટકમાં કંપની માટે એક પંક્તિ ઉમેરો.,
+Company Not Linked,કંપની લિંક્ટેડ નથી,
+Import Chart of Accounts from CSV / Excel files,સીએસવી / એક્સેલ ફાઇલોથી એકાઉન્ટ્સનું ચાર્ટ આયાત કરો,
+Completed Qty cannot be greater than 'Qty to Manufacture',પૂર્ણ થયેલી ક્યુટી &#39;ક્યૂટી ટુ મેન્યુફેક્ચરિંગ&#39; કરતા મોટી ન હોઈ શકે,
+"Row {0}: For Supplier {1}, Email Address is Required to send an email","પંક્તિ {0}: સપ્લાયર {1} માટે, ઇમેઇલ મોકલવા માટે ઇમેઇલ સરનામું આવશ્યક છે",
diff --git a/erpnext/translations/he.csv b/erpnext/translations/he.csv
index a3d76d5..45701bb 100644
--- a/erpnext/translations/he.csv
+++ b/erpnext/translations/he.csv
@@ -521,7 +521,6 @@
 Chargeble,חיוב מטען,
 Charges are updated in Purchase Receipt against each item,חיובים מתעדכנות בקבלת רכישה כנגד כל פריט,
 "Charges will be distributed proportionately based on item qty or amount, as per your selection","תשלום נוסף שיחולק לפי אופן יחסי על כמות פריט או סכום, בהתאם לבחירתך",
-Chart Of Accounts,תרשים של חשבונות,
 Chart of Cost Centers,תרשים של מרכזי עלות,
 Check all,סמן הכל,
 Checkout,לבדוק,
@@ -581,7 +580,6 @@
 Compensatory Off,Off המפצה,
 Compensatory leave request days not in valid holidays,ימי בקשת חופשת פיצויים שאינם בחגים תקפים,
 Complaint,תְלוּנָה,
-Completed Qty can not be greater than 'Qty to Manufacture',"כמות שהושלמה לא יכולה להיות גדולה מ 'כמות לייצור """,
 Completion Date,תאריך סיום,
 Computer,מחשב,
 Condition,מצב,
@@ -2033,7 +2031,6 @@
 Please select Charge Type first,אנא בחר Charge סוג ראשון,
 Please select Company,אנא בחר חברה,
 Please select Company and Designation,אנא בחר חברה וייעוד,
-Please select Company and Party Type first,אנא בחר סוג החברה והמפלגה ראשון,
 Please select Company and Posting Date to getting entries,אנא בחר חברה ותאריך פרסום לקבלת רשומות,
 Please select Company first,אנא בחר החברה ראשונה,
 Please select Completion Date for Completed Asset Maintenance Log,אנא בחר תאריך סיום עבור יומן תחזוקת הנכסים שהושלם,
@@ -2980,7 +2977,6 @@
 The name of your company for which you are setting up this system.,שמה של החברה שלך שאתה מגדיר את המערכת הזאת.,
 The number of shares and the share numbers are inconsistent,מספר המניות ומספרי המניות אינם עקביים,
 The payment gateway account in plan {0} is different from the payment gateway account in this payment request,חשבון שער התשלום בתכנית {0} שונה מחשבון שער התשלום בבקשת תשלום זו,
-The request for quotation can be accessed by clicking on the following link,ניתן לגשת לבקשה להצעת מחיר על ידי לחיצה על הקישור הבא,
 The selected BOMs are not for the same item,בומס שנבחר אינו תמורת אותו הפריט,
 The selected item cannot have Batch,הפריט שנבחר לא יכול להיות אצווה,
 The seller and the buyer cannot be the same,המוכר והקונה לא יכולים להיות זהים,
@@ -3130,7 +3126,6 @@
 Total flexible benefit component amount {0} should not be less than max benefits {1},הסכום הכולל של רכיב ההטבה הגמיש {0} לא צריך להיות פחות מההטבות המקסימליות {1},
 Total hours: {0},סה&quot;כ שעות: {0},
 Total leaves allocated is mandatory for Leave Type {0},סה&quot;כ עלים שהוקצו חובה עבור סוג חופשה {0},
-Total weightage assigned should be 100%. It is {0},"weightage סה""כ הוקצה צריך להיות 100%. זה {0}",
 Total working hours should not be greater than max working hours {0},סך שעות העבודה לא צריך להיות גדול משעות העבודה המקסימליות {0},
 Total {0} ({1}),סה&quot;כ {0} ({1}),
 "Total {0} for all items is zero, may be you should change 'Distribute Charges Based On'","סה&quot;כ {0} לכל הפריטים הוא אפס, יתכן שתשנה את &#39;הפץ חיובים על סמך&#39;",
@@ -3544,7 +3539,6 @@
 Company field is required,נדרש שדה חברה,
 Creating Dimensions...,יוצר מימדים ...,
 Duplicate entry against the item code {0} and manufacturer {1},ערך כפול מול קוד הפריט {0} והיצרן {1},
-Import Chart Of Accounts from CSV / Excel files,ייבא תרשים חשבונות מקבצי CSV / Excel,
 Invalid GSTIN! The input you've entered doesn't match the GSTIN format for UIN Holders or Non-Resident OIDAR Service Providers,GSTIN לא חוקי! הקלט שהזנת אינו תואם לפורמט GSTIN עבור מחזיקי UIN או ספקי שירות OIDAR שאינם תושבים,
 Invoice Grand Total,חשבונית גרנד סה&quot;כ,
 Last carbon check date cannot be a future date,תאריך בדיקת הפחמן האחרון לא יכול להיות תאריך עתידי,
@@ -3921,7 +3915,6 @@
 Plaid public token error,שגיאת אסימון ציבורי משובץ,
 Plaid transactions sync error,שגיאת סנכרון של עסקאות משובצות,
 Please check the error log for details about the import errors,אנא בדוק ביומן השגיאות לקבלת פרטים אודות שגיאות הייבוא,
-Please click on the following link to set your new password,אנא לחץ על הקישור הבא כדי להגדיר את הסיסמה החדשה שלך,
 Please create <b>DATEV Settings</b> for Company <b>{}</b>.,אנא צור <b>הגדרות DATEV</b> לחברה <b>{}</b> .,
 Please create adjustment Journal Entry for amount {0} ,אנא צור ערך יומן התאמה לסכום {0},
 Please do not create more than 500 items at a time,נא לא ליצור יותר מ -500 פריטים בכל פעם,
@@ -3997,6 +3990,7 @@
 Release date must be in the future,תאריך השחרור חייב להיות בעתיד,
 Relieving Date must be greater than or equal to Date of Joining,תאריך הקלה חייב להיות גדול או שווה לתאריך ההצטרפות,
 Rename,שינוי שם,
+Rename Not Allowed,שינוי שם אסור,
 Repayment Method is mandatory for term loans,שיטת ההחזר הינה חובה עבור הלוואות לתקופה,
 Repayment Start Date is mandatory for term loans,מועד התחלת ההחזר הוא חובה עבור הלוואות לתקופה,
 Report Item,פריט דוח,
@@ -4043,7 +4037,6 @@
 Select All,בחר הכל,
 Select Difference Account,בחר חשבון ההבדל,
 Select a Default Priority.,בחר עדיפות ברירת מחדל.,
-Select a Supplier from the Default Supplier List of the items below.,בחר ספק מרשימת ספקי ברירת המחדל של הפריטים שלהלן.,
 Select a company,בחר חברה,
 Select finance book for the item {0} at row {1},בחר ספר פיננסים לפריט {0} בשורה {1},
 Select only one Priority as Default.,בחר עדיפות אחת בלבד כברירת מחדל.,
@@ -4247,7 +4240,6 @@
 Actual ,בפועל,
 Add to cart,הוסף לסל,
 Budget,תקציב,
-Chart Of Accounts Importer,תרשים יבואן חשבונות,
 Chart of Accounts,תרשים של חשבונות,
 Customer database.,מאגר מידע על לקוחות.,
 Days Since Last order,ימים מאז הזמנה אחרונה,
@@ -4546,7 +4538,6 @@
 Check Supplier Invoice Number Uniqueness,ספק בדוק חשבונית מספר הייחוד,
 Make Payment via Journal Entry,בצע תשלום באמצעות הזנת יומן,
 Unlink Payment on Cancellation of Invoice,בטל את קישור התשלום בביטול החשבונית,
-Unlink Advance Payment on Cancelation of Order,בטל קישור מקדמה בעת ביטול ההזמנה,
 Book Asset Depreciation Entry Automatically,הזן פחת נכסי ספר באופן אוטומטי,
 Automatically Add Taxes and Charges from Item Tax Template,הוסף אוטומטית מיסים וחיובים מתבנית מס פריט,
 Automatically Fetch Payment Terms,אחזר אוטומטית תנאי תשלום,
@@ -4940,7 +4931,6 @@
 POS Customer Group,קבוצת לקוחות של קופה,
 POS Field,שדה קופה,
 POS Item Group,קבוצת פריטי קופה,
-[Select],[בחר],
 Company Address,כתובת החברה,
 Update Stock,בורסת עדכון,
 Ignore Pricing Rule,התעלם כלל תמחור,
@@ -6481,7 +6471,6 @@
 Appraisal Template,הערכת תבנית,
 For Employee Name,לשם עובדים,
 Goals,מטרות,
-Calculate Total Score,חישוב ציון הכולל,
 Total Score (Out of 5),ציון כולל (מתוך 5),
 "Any other remarks, noteworthy effort that should go in the records.","כל דברים אחרים, מאמץ ראוי לציון שצריכה ללכת ברשומות.",
 Appraisal Goal,מטרת הערכה,
@@ -6599,11 +6588,6 @@
 Reason for Leaving,סיבה להשארה,
 Leave Encashed?,השאר Encashed?,
 Encashment Date,תאריך encashment,
-Exit Interview Details,פרטי ראיון יציאה,
-Held On,במוחזק,
-Reason for Resignation,סיבה להתפטרות,
-Better Prospects,סיכויים טובים יותר,
-Health Concerns,חששות בריאות,
 New Workplace,חדש במקום העבודה,
 HR-EAD-.YYYY.-,HR-EAD-.YYYY.-,
 Returned Amount,הסכום שהוחזר,
@@ -8239,9 +8223,6 @@
 Manufacturers used in Items,יצרנים השתמשו בפריטים,
 Limited to 12 characters,מוגבל ל -12 תווים,
 MAT-MR-.YYYY.-,MAT-MR-.YYYY.-,
-Set Warehouse,הגדר מחסן,
-Sets 'For Warehouse' in each row of the Items table.,מגדיר &#39;עבור מחסן&#39; בכל שורה בטבלת הפריטים.,
-Requested For,ביקש ל,
 Partially Ordered,הוזמן חלקית,
 Transferred,הועבר,
 % Ordered,% מסודר,
@@ -8690,8 +8671,6 @@
 Select warehouse for material requests,בחר מחסן לבקשות חומר,
 Transfer Materials For Warehouse {0},העברת חומרים למחסן {0},
 Production Plan Material Request Warehouse,מחסן בקשת חומר לתכנית ייצור,
-Set From Warehouse,מוגדר מהמחסן,
-Source Warehouse (Material Transfer),מחסן מקור (העברת חומרים),
 Sets 'Source Warehouse' in each row of the items table.,מגדיר &#39;מחסן מקור&#39; בכל שורה בטבלת הפריטים.,
 Sets 'Target Warehouse' in each row of the items table.,מגדיר &#39;מחסן יעד&#39; בכל שורה בטבלת הפריטים.,
 Show Cancelled Entries,הצג ערכים שבוטלו,
@@ -9157,7 +9136,6 @@
 Is Income Tax Component,הוא רכיב מס הכנסה,
 Component properties and references ,מאפייני רכיבים והפניות,
 Additional Salary ,שכר נוסף,
-Condtion and formula,הולכה ונוסחה,
 Unmarked days,ימים לא מסומנים,
 Absent Days,ימי נעדרים,
 Conditions and Formula variable and example,משתנה תנאי ונוסחה ודוגמא,
@@ -9444,7 +9422,6 @@
 Please check your Plaid client ID and secret values,אנא בדוק את מזהה הלקוח המשובץ שלך ואת הערכים הסודיים שלך,
 Bank transaction creation error,שגיאה ביצירת עסקאות בנק,
 Unit of Measurement,יחידת מידה,
-Row #{}: Selling rate for item {} is lower than its {}. Selling rate should be atleast {},שורה מספר {}: שיעור המכירה של הפריט {} נמוך מ- {} שלו. שיעור המכירה צריך להיות לפחות {},
 Fiscal Year {0} Does Not Exist,שנת הכספים {0} לא קיימת,
 Row # {0}: Returned Item {1} does not exist in {2} {3},שורה מספר {0}: פריט שהוחזר {1} אינו קיים ב {2} {3},
 Valuation type charges can not be marked as Inclusive,לא ניתן לסמן חיובים מסוג הערכת שווי כולל,
@@ -9598,8 +9575,60 @@
 Response Time for {0} priority in row {1} can't be greater than Resolution Time.,זמן התגובה ל {0} עדיפות בשורה {1} לא יכול להיות גדול משעת הרזולוציה.,
 {0} is not enabled in {1},{0} אינו מופעל ב- {1},
 Group by Material Request,קבץ לפי בקשת חומרים,
-"Row {0}: For Supplier {0}, Email Address is Required to Send Email","שורה {0}: עבור הספק {0}, כתובת הדוא&quot;ל נדרשת כדי לשלוח דוא&quot;ל",
 Email Sent to Supplier {0},אימייל נשלח לספק {0},
 "The Access to Request for Quotation From Portal is Disabled. To Allow Access, Enable it in Portal Settings.","הגישה לבקשה להצעת מחיר מהפורטל אינה זמינה. כדי לאפשר גישה, הפעל אותו בהגדרות הפורטל.",
 Supplier Quotation {0} Created,הצעת מחיר לספק {0} נוצרה,
 Valid till Date cannot be before Transaction Date,תוקף עד תאריך לא יכול להיות לפני תאריך העסקה,
+Unlink Advance Payment on Cancellation of Order,בטל קישור של תשלום מקדמה בביטול ההזמנה,
+"Simple Python Expression, Example: territory != 'All Territories'","ביטוי פייתון פשוט, דוגמה: טריטוריה! = &#39;כל השטחים&#39;",
+Sales Contributions and Incentives,תרומות מכירות ותמריצים,
+Sourced by Supplier,מקור הספק,
+Total weightage assigned should be 100%.<br>It is {0},המשקל הכללי שהוקצה צריך להיות 100%.<br> זה {0},
+Account {0} exists in parent company {1}.,החשבון {0} קיים בחברת האם {1}.,
+"To overrule this, enable '{0}' in company {1}","כדי לבטל את זה, הפעל את &#39;{0}&#39; בחברה {1}",
+Invalid condition expression,ביטוי מצב לא חוקי,
+Please Select a Company First,אנא בחר חברה ראשונה,
+Please Select Both Company and Party Type First,אנא בחר ראשית הן סוג החברה והן סוג המפלגה,
+Provide the invoice portion in percent,ספק את חלק החשבונית באחוזים,
+Give number of days according to prior selection,תן מספר ימים על פי בחירה מוקדמת,
+Email Details,פרטי דוא&quot;ל,
+"Select a greeting for the receiver. E.g. Mr., Ms., etc.","בחר ברכה למקלט. למשל מר, גב &#39;וכו&#39;.",
+Preview Email,תצוגה מקדימה של אימייל,
+Please select a Supplier,אנא בחר ספק,
+Supplier Lead Time (days),זמן עופרת ספק (ימים),
+"Home, Work, etc.","בית, עבודה וכו &#39;.",
+Exit Interview Held On,ראיון יציאה נערך,
+Condition and formula,מצב ונוסחה,
+Sets 'Target Warehouse' in each row of the Items table.,מגדיר &#39;מחסן יעד&#39; בכל שורה בטבלת הפריטים.,
+Sets 'Source Warehouse' in each row of the Items table.,מגדיר &#39;מחסן מקור&#39; בכל שורה בטבלת הפריטים.,
+POS Register,הרשמת קופה,
+"Can not filter based on POS Profile, if grouped by POS Profile","לא ניתן לסנן על סמך פרופיל קופה, אם מקובצים לפי פרופיל קופה",
+"Can not filter based on Customer, if grouped by Customer","לא ניתן לסנן על בסיס לקוח, אם מקובץ לפי לקוח",
+"Can not filter based on Cashier, if grouped by Cashier","לא ניתן לסנן על בסיס קופאי, אם מקובץ לפי קופאית",
+Payment Method,אמצעי תשלום,
+"Can not filter based on Payment Method, if grouped by Payment Method","לא ניתן לסנן על בסיס אמצעי תשלום, אם מקובצים לפי אמצעי תשלום",
+Supplier Quotation Comparison,השוואת הצעות מחיר לספקים,
+Price per Unit (Stock UOM),מחיר ליחידה (UOM מלאי),
+Group by Supplier,קבץ לפי ספק,
+Group by Item,קבץ לפי פריט,
+Remember to set {field_label}. It is required by {regulation}.,זכור להגדיר את {field_label}. זה נדרש על ידי {Regulation}.,
+Enrollment Date cannot be before the Start Date of the Academic Year {0},תאריך ההרשמה לא יכול להיות לפני תאריך ההתחלה של השנה האקדמית {0},
+Enrollment Date cannot be after the End Date of the Academic Term {0},תאריך ההרשמה לא יכול להיות אחרי תאריך הסיום של הקדנציה האקדמית {0},
+Enrollment Date cannot be before the Start Date of the Academic Term {0},תאריך ההרשמה לא יכול להיות לפני תאריך ההתחלה של הקדנציה האקדמית {0},
+Posting future transactions are not allowed due to Immutable Ledger,לא ניתן לפרסם עסקאות עתידיות בגלל חשבונאות בלתי ניתנות לשינוי,
+Future Posting Not Allowed,פרסום עתידי אינו מותר,
+"To enable Capital Work in Progress Accounting, ","כדי לאפשר חשבונאות בביצוע עבודות הון,",
+you must select Capital Work in Progress Account in accounts table,עליך לבחור חשבון עבודות הון בתהליך בטבלת החשבונות,
+You can also set default CWIP account in Company {},ניתן גם להגדיר חשבון CWIP המוגדר כברירת מחדל בחברה {},
+The Request for Quotation can be accessed by clicking on the following button,ניתן לגשת לבקשה להצעת מחיר על ידי לחיצה על הכפתור הבא,
+Regards,בברכה,
+Please click on the following button to set your new password,אנא לחץ על הכפתור הבא כדי להגדיר את הסיסמה החדשה שלך,
+Update Password,עדכן סיסמה,
+Row #{}: Selling rate for item {} is lower than its {}. Selling {} should be atleast {},שורה מספר {}: שיעור המכירה של הפריט {} נמוך מ- {} שלו. המכירה {} צריכה להיות לפחות {},
+You can alternatively disable selling price validation in {} to bypass this validation.,לחלופין תוכל להשבית את אימות מחיר המכירה ב- {} כדי לעקוף את האימות הזה.,
+Invalid Selling Price,מחיר מכירה לא חוקי,
+Address needs to be linked to a Company. Please add a row for Company in the Links table.,כתובת צריכה להיות מקושרת לחברה. אנא הוסף שורה לחברה בטבלת הקישורים.,
+Company Not Linked,חברה לא מקושרת,
+Import Chart of Accounts from CSV / Excel files,ייבא תרשים חשבונות מקבצי CSV / Excel,
+Completed Qty cannot be greater than 'Qty to Manufacture',כמות שהושלמה לא יכולה להיות גדולה מ- &#39;כמות לייצור&#39;,
+"Row {0}: For Supplier {1}, Email Address is Required to send an email","שורה {0}: לספק {1}, נדרשת כתובת דוא&quot;ל כדי לשלוח דוא&quot;ל",
diff --git a/erpnext/translations/hi.csv b/erpnext/translations/hi.csv
index 3e7db82..f4390ad 100644
--- a/erpnext/translations/hi.csv
+++ b/erpnext/translations/hi.csv
@@ -521,7 +521,6 @@
 Chargeble,Chargeble,
 Charges are updated in Purchase Receipt against each item,प्रभार प्रत्येक आइटम के खिलाफ खरीद रसीद में नवीनीकृत कर रहे हैं,
 "Charges will be distributed proportionately based on item qty or amount, as per your selection","प्रभार अनुपात में अपने चयन के अनुसार, मद मात्रा या राशि के आधार पर वितरित किया जाएगा",
-Chart Of Accounts,खातों का चार्ट,
 Chart of Cost Centers,लागत केंद्र के चार्ट,
 Check all,सभी की जांच करो,
 Checkout,चेक आउट,
@@ -581,7 +580,6 @@
 Compensatory Off,प्रतिपूरक बंद,
 Compensatory leave request days not in valid holidays,मुआवजा छोड़ने के अनुरोध दिन वैध छुट्टियों में नहीं,
 Complaint,शिकायत,
-Completed Qty can not be greater than 'Qty to Manufacture',की तुलना में 'मात्रा निर्माण करने के लिए' पूरी की गई मात्रा अधिक नहीं हो सकता,
 Completion Date,पूरा करने की तिथि,
 Computer,कंप्यूटर,
 Condition,शर्त,
@@ -2033,7 +2031,6 @@
 Please select Charge Type first,प्रभारी प्रकार पहले का चयन करें,
 Please select Company,कंपनी का चयन करें,
 Please select Company and Designation,कृपया कंपनी और पदनाम का चयन करें,
-Please select Company and Party Type first,पहले कंपनी और पार्टी के प्रकार का चयन करें,
 Please select Company and Posting Date to getting entries,कृपया प्रविष्टियां प्राप्त करने के लिए कंपनी और पोस्टिंग तिथि का चयन करें,
 Please select Company first,पहले कंपनी का चयन करें,
 Please select Completion Date for Completed Asset Maintenance Log,कृपया पूर्ण संपत्ति रखरखाव लॉग के लिए समापन तिथि का चयन करें,
@@ -2980,7 +2977,6 @@
 The name of your company for which you are setting up this system.,"आप इस प्रणाली स्थापित कर रहे हैं , जिसके लिए आपकी कंपनी का नाम .",
 The number of shares and the share numbers are inconsistent,शेयरों की संख्या और शेयर संख्याएं असंगत हैं,
 The payment gateway account in plan {0} is different from the payment gateway account in this payment request,योजना {0} में भुगतान गेटवे खाता इस भुगतान अनुरोध में भुगतान गेटवे खाते से अलग है,
-The request for quotation can be accessed by clicking on the following link,उद्धरण के लिए अनुरोध नीचे दिए गए लिंक पर क्लिक करके पहुँचा जा सकता है,
 The selected BOMs are not for the same item,चुने गए BOMs एक ही मद के लिए नहीं हैं,
 The selected item cannot have Batch,चयनित आइटम बैच नहीं हो सकता,
 The seller and the buyer cannot be the same,विक्रेता और खरीदार एक ही नहीं हो सकता,
@@ -3130,7 +3126,6 @@
 Total flexible benefit component amount {0} should not be less than max benefits {1},कुल लचीला लाभ घटक राशि {0} अधिकतम लाभ से कम नहीं होनी चाहिए {1},
 Total hours: {0},कुल घंटे: {0},
 Total leaves allocated is mandatory for Leave Type {0},आवंटित कुल पत्तियां छुट्टी प्रकार {0} के लिए अनिवार्य है,
-Total weightage assigned should be 100%. It is {0},कुल आवंटित वेटेज 100 % होना चाहिए . यह है {0},
 Total working hours should not be greater than max working hours {0},कुल काम के घंटे अधिकतम काम के घंटे से अधिक नहीं होना चाहिए {0},
 Total {0} ({1}),कुल {0} ({1}),
 "Total {0} for all items is zero, may be you should change 'Distribute Charges Based On'","कुल {0} सभी मदों के लिए शून्य है, तो आप &#39;के आधार पर शुल्क वितरित&#39; परिवर्तन होना चाहिए हो सकता है",
@@ -3544,7 +3539,6 @@
 Company field is required,कंपनी क्षेत्र की आवश्यकता है,
 Creating Dimensions...,आयाम बनाना ...,
 Duplicate entry against the item code {0} and manufacturer {1},आइटम कोड {0} और निर्माता {1} के खिलाफ डुप्लिकेट प्रविष्टि,
-Import Chart Of Accounts from CSV / Excel files,CSV / Excel फ़ाइलों से खातों का आयात चार्ट,
 Invalid GSTIN! The input you've entered doesn't match the GSTIN format for UIN Holders or Non-Resident OIDAR Service Providers,अमान्य GSTIN! आपके द्वारा दर्ज किया गया इनपुट UIN धारकों या गैर-निवासी OIDAR सेवा प्रदाताओं के लिए GSTIN प्रारूप से मेल नहीं खाता है,
 Invoice Grand Total,इनवॉइस ग्रैंड टोटल,
 Last carbon check date cannot be a future date,अंतिम कार्बन जांच की तारीख भविष्य की तारीख नहीं हो सकती,
@@ -3921,7 +3915,6 @@
 Plaid public token error,प्लेड पब्लिक टोकन एरर,
 Plaid transactions sync error,प्लेड ट्रांजेक्शन सिंक एरर,
 Please check the error log for details about the import errors,कृपया आयात त्रुटियों के बारे में विवरण के लिए त्रुटि लॉग की जांच करें,
-Please click on the following link to set your new password,अपना नया पासवर्ड सेट करने के लिए नीचे दिए गए लिंक पर क्लिक करें,
 Please create <b>DATEV Settings</b> for Company <b>{}</b>.,कृपया कंपनी <b>{} के</b> लिए <b>DATEV सेटिंग</b> बनाएं।,
 Please create adjustment Journal Entry for amount {0} ,कृपया राशि {0} के लिए समायोजन जर्नल प्रविष्टि बनाएँ,
 Please do not create more than 500 items at a time,कृपया एक बार में 500 से अधिक आइटम न बनाएं,
@@ -3997,6 +3990,7 @@
 Release date must be in the future,रिलीज की तारीख भविष्य में होनी चाहिए,
 Relieving Date must be greater than or equal to Date of Joining,"राहत की तारीख, ज्वाइनिंग की तारीख से अधिक या उसके बराबर होनी चाहिए",
 Rename,नाम बदलें,
+Rename Not Allowed,नाम नहीं दिया गया,
 Repayment Method is mandatory for term loans,सावधि ऋण के लिए चुकौती विधि अनिवार्य है,
 Repayment Start Date is mandatory for term loans,सावधि ऋण के लिए चुकौती प्रारंभ तिथि अनिवार्य है,
 Report Item,वस्तु की सूचना,
@@ -4043,7 +4037,6 @@
 Select All,सभी का चयन,
 Select Difference Account,अंतर खाता चुनें,
 Select a Default Priority.,एक डिफ़ॉल्ट प्राथमिकता चुनें।,
-Select a Supplier from the Default Supplier List of the items below.,नीचे दी गई वस्तुओं की डिफ़ॉल्ट आपूर्तिकर्ता सूची से एक आपूर्तिकर्ता का चयन करें।,
 Select a company,एक कंपनी का चयन करें,
 Select finance book for the item {0} at row {1},पंक्ति {1} पर आइटम {0} के लिए वित्त पुस्तक चुनें,
 Select only one Priority as Default.,डिफ़ॉल्ट के रूप में केवल एक प्राथमिकता का चयन करें।,
@@ -4247,7 +4240,6 @@
 Actual ,वास्तविक,
 Add to cart,कार्ट में जोड़ें,
 Budget,बजट,
-Chart Of Accounts Importer,लेखा आयातक का चार्ट,
 Chart of Accounts,लेखा जोखा का व्यौरा,
 Customer database.,ग्राहक डेटाबेस।,
 Days Since Last order,दिनों से पिछले आदेश,
@@ -4546,7 +4538,6 @@
 Check Supplier Invoice Number Uniqueness,चेक आपूर्तिकर्ता चालान संख्या अद्वितीयता,
 Make Payment via Journal Entry,जर्नल प्रविष्टि के माध्यम से भुगतान करने के,
 Unlink Payment on Cancellation of Invoice,चालान को रद्द करने पर भुगतान अनलिंक,
-Unlink Advance Payment on Cancelation of Order,आदेश को रद्द करने पर अग्रिम भुगतान अनलिंक करें,
 Book Asset Depreciation Entry Automatically,पुस्तक परिसंपत्ति मूल्यह्रास प्रविष्टि स्वचालित रूप से,
 Automatically Add Taxes and Charges from Item Tax Template,आइटम टैक्स टेम्पलेट से स्वचालित रूप से टैक्स और शुल्क जोड़ें,
 Automatically Fetch Payment Terms,स्वचालित रूप से भुगतान शर्तें प्राप्त करें,
@@ -4940,7 +4931,6 @@
 POS Customer Group,पीओएस ग्राहक समूह,
 POS Field,पीओएस फील्ड,
 POS Item Group,पीओएस मद समूह,
-[Select],[ चुनें ],
 Company Address,कंपनी का पता,
 Update Stock,स्टॉक अद्यतन,
 Ignore Pricing Rule,मूल्य निर्धारण नियम की अनदेखी,
@@ -6481,7 +6471,6 @@
 Appraisal Template,मूल्यांकन टेम्पलेट,
 For Employee Name,कर्मचारी का नाम,
 Goals,लक्ष्य,
-Calculate Total Score,कुल स्कोर की गणना,
 Total Score (Out of 5),कुल स्कोर (5 से बाहर),
 "Any other remarks, noteworthy effort that should go in the records.","किसी भी अन्य टिप्पणी, अभिलेखों में जाना चाहिए कि उल्लेखनीय प्रयास।",
 Appraisal Goal,मूल्यांकन लक्ष्य,
@@ -6599,11 +6588,6 @@
 Reason for Leaving,छोड़ने के लिए कारण,
 Leave Encashed?,भुनाया छोड़ दो?,
 Encashment Date,नकदीकरण तिथि,
-Exit Interview Details,साक्षात्कार विवरण से बाहर निकलें,
-Held On,पर Held,
-Reason for Resignation,इस्तीफे का कारण,
-Better Prospects,बेहतर संभावनाओं,
-Health Concerns,स्वास्थ्य चिंताएं,
 New Workplace,नए कार्यस्थल,
 HR-EAD-.YYYY.-,मानव संसाधन-EAD-.YYYY.-,
 Returned Amount,लौटाई गई राशि,
@@ -8239,9 +8223,6 @@
 Manufacturers used in Items,वस्तुओं में इस्तेमाल किया निर्माता,
 Limited to 12 characters,12 अक्षरों तक सीमित,
 MAT-MR-.YYYY.-,मेट-एमआर .YYYY.-,
-Set Warehouse,वेयरहाउस सेट करें,
-Sets 'For Warehouse' in each row of the Items table.,आइटम तालिका की प्रत्येक पंक्ति में &#39;वेयरहाउस के लिए&#39; सेट करता है।,
-Requested For,के लिए अनुरोध,
 Partially Ordered,आंशिक रूप से आदेश दिया गया,
 Transferred,का तबादला,
 % Ordered,% का आदेश दिया,
@@ -8690,8 +8671,6 @@
 Select warehouse for material requests,भौतिक अनुरोधों के लिए वेयरहाउस का चयन करें,
 Transfer Materials For Warehouse {0},गोदाम {0} के लिए स्थानांतरण सामग्री,
 Production Plan Material Request Warehouse,उत्पादन योजना सामग्री अनुरोध गोदाम,
-Set From Warehouse,वेयरहाउस से सेट करें,
-Source Warehouse (Material Transfer),स्रोत वेयरहाउस (सामग्री स्थानांतरण),
 Sets 'Source Warehouse' in each row of the items table.,आइटम तालिका की प्रत्येक पंक्ति में &#39;स्रोत वेयरहाउस&#39; सेट करता है।,
 Sets 'Target Warehouse' in each row of the items table.,आइटम तालिका की प्रत्येक पंक्ति में &#39;लक्ष्य वेयरहाउस&#39; सेट करता है।,
 Show Cancelled Entries,रद्द प्रविष्टियाँ दिखाएँ,
@@ -9157,7 +9136,6 @@
 Is Income Tax Component,इनकम टैक्स कंपोनेंट है,
 Component properties and references ,घटक गुण और संदर्भ,
 Additional Salary ,अतिरिक्त वेतन,
-Condtion and formula,संक्षेपण और सूत्र,
 Unmarked days,अचिंतित दिन,
 Absent Days,अनुपस्थित दिन,
 Conditions and Formula variable and example,शर्तें और सूत्र चर और उदाहरण,
@@ -9444,7 +9422,6 @@
 Please check your Plaid client ID and secret values,कृपया अपने प्लेड क्लाइंट आईडी और गुप्त मूल्यों की जाँच करें,
 Bank transaction creation error,बैंक लेनदेन निर्माण त्रुटि,
 Unit of Measurement,माप की इकाई,
-Row #{}: Selling rate for item {} is lower than its {}. Selling rate should be atleast {},"पंक्ति # {}: आइटम {} के लिए विक्रय दर, इसके {} से कम है। विक्रय दर कम से कम {} होनी चाहिए",
 Fiscal Year {0} Does Not Exist,वित्तीय वर्ष {0} का अस्तित्व नहीं है,
 Row # {0}: Returned Item {1} does not exist in {2} {3},पंक्ति # {0}: लौटाई गई वस्तु {1} {2} {3} में मौजूद नहीं है,
 Valuation type charges can not be marked as Inclusive,मूल्यांकन प्रकार के आरोपों को समावेशी के रूप में चिह्नित नहीं किया जा सकता है,
@@ -9598,8 +9575,60 @@
 Response Time for {0} priority in row {1} can't be greater than Resolution Time.,{0} प्राथमिकता के लिए पंक्ति {1} में प्रतिक्रिया का समय रिज़ॉल्यूशन समय से अधिक नहीं हो सकता है।,
 {0} is not enabled in {1},{0} {1} में सक्षम नहीं है,
 Group by Material Request,सामग्री अनुरोध द्वारा समूह,
-"Row {0}: For Supplier {0}, Email Address is Required to Send Email","पंक्ति {0}: आपूर्तिकर्ता {0} के लिए, ईमेल पता ईमेल भेजने के लिए आवश्यक है",
 Email Sent to Supplier {0},आपूर्तिकर्ता को ईमेल भेजा गया {0},
 "The Access to Request for Quotation From Portal is Disabled. To Allow Access, Enable it in Portal Settings.","पोर्टल से कोटेशन के लिए अनुरोध तक पहुँच अक्षम है। एक्सेस की अनुमति देने के लिए, इसे पोर्टल सेटिंग्स में सक्षम करें।",
 Supplier Quotation {0} Created,आपूर्तिकर्ता उद्धरण {0} बनाया गया,
 Valid till Date cannot be before Transaction Date,तिथि तक मान्य लेन-देन की तारीख से पहले नहीं हो सकता है,
+Unlink Advance Payment on Cancellation of Order,ऑर्डर रद्द करने पर अनलिंक अग्रिम भुगतान,
+"Simple Python Expression, Example: territory != 'All Territories'","सरल अजगर अभिव्यक्ति, उदाहरण: क्षेत्र! = &#39;सभी क्षेत्र&#39;",
+Sales Contributions and Incentives,बिक्री योगदान और प्रोत्साहन,
+Sourced by Supplier,आपूर्तिकर्ता द्वारा शोक,
+Total weightage assigned should be 100%.<br>It is {0},निर्धारित कुल भार 100% होना चाहिए।<br> यह {0} है,
+Account {0} exists in parent company {1}.,खाता {0} मूल कंपनी में मौजूद है {1}।,
+"To overrule this, enable '{0}' in company {1}","इसे पूरा करने के लिए, &#39;{0}&#39; को कंपनी {1} में सक्षम करें",
+Invalid condition expression,अमान्य स्थिति अभिव्यक्ति,
+Please Select a Company First,कृपया पहले एक कंपनी चुनें,
+Please Select Both Company and Party Type First,कृपया कंपनी और पार्टी दोनों प्रकार का चयन करें,
+Provide the invoice portion in percent,प्रतिशत में चालान भाग प्रदान करें,
+Give number of days according to prior selection,पूर्व चयन के अनुसार दिनों की संख्या दें,
+Email Details,ईमेल विवरण,
+"Select a greeting for the receiver. E.g. Mr., Ms., etc.","रिसीवर के लिए एक ग्रीटिंग का चयन करें। जैसे श्री, सुश्री, आदि।",
+Preview Email,ईमेल का पूर्वावलोकन करें,
+Please select a Supplier,कृपया एक आपूर्तिकर्ता का चयन करें,
+Supplier Lead Time (days),आपूर्तिकर्ता लीड समय (दिन),
+"Home, Work, etc.","घर, काम, आदि।",
+Exit Interview Held On,साक्षात्कार से बाहर निकलें,
+Condition and formula,स्थिति और सूत्र,
+Sets 'Target Warehouse' in each row of the Items table.,आइटम तालिका की प्रत्येक पंक्ति में &#39;लक्ष्य वेयरहाउस&#39; सेट करता है।,
+Sets 'Source Warehouse' in each row of the Items table.,आइटम तालिका की प्रत्येक पंक्ति में &#39;स्रोत वेयरहाउस&#39; सेट करता है।,
+POS Register,पीओएस रजिस्टर,
+"Can not filter based on POS Profile, if grouped by POS Profile","पीओएस प्रोफ़ाइल के आधार पर फ़िल्टर नहीं किया जा सकता है, अगर पीओएस प्रोफ़ाइल द्वारा समूहीकृत किया गया हो",
+"Can not filter based on Customer, if grouped by Customer","यदि ग्राहक द्वारा समूहीकृत किया गया है, तो ग्राहक के आधार पर फ़िल्टर नहीं किया जा सकता है",
+"Can not filter based on Cashier, if grouped by Cashier","कैशियर के आधार पर फ़िल्टर नहीं किया जा सकता है, यदि कैशियर द्वारा समूहीकृत किया गया है",
+Payment Method,भुगतान का तरीका,
+"Can not filter based on Payment Method, if grouped by Payment Method","यदि भुगतान विधि द्वारा समूहीकृत किया गया है, तो भुगतान विधि के आधार पर फ़िल्टर नहीं किया जा सकता है",
+Supplier Quotation Comparison,आपूर्तिकर्ता उद्धरण तुलना,
+Price per Unit (Stock UOM),मूल्य प्रति यूनिट (स्टॉक यूओएम),
+Group by Supplier,आपूर्तिकर्ता द्वारा समूह,
+Group by Item,आइटम द्वारा समूह,
+Remember to set {field_label}. It is required by {regulation}.,{फ़ील्ड_लैब} सेट करना याद रखें। यह {विनियमन} द्वारा आवश्यक है।,
+Enrollment Date cannot be before the Start Date of the Academic Year {0},नामांकन तिथि शैक्षणिक वर्ष की शुरुआत तिथि {0} से पहले नहीं हो सकती है,
+Enrollment Date cannot be after the End Date of the Academic Term {0},नामांकन तिथि शैक्षणिक अवधि की अंतिम तिथि के बाद नहीं हो सकती {{},
+Enrollment Date cannot be before the Start Date of the Academic Term {0},नामांकन तिथि शैक्षणिक अवधि के प्रारंभ दिनांक से पहले नहीं हो सकती {0},
+Posting future transactions are not allowed due to Immutable Ledger,भविष्य के लेन-देन को अपरिवर्तनीय लेजर के कारण पोस्ट करने की अनुमति नहीं है,
+Future Posting Not Allowed,भविष्य पोस्टिंग अनुमति नहीं है,
+"To enable Capital Work in Progress Accounting, ","प्रगति लेखा में पूंजी कार्य को सक्षम करने के लिए,",
+you must select Capital Work in Progress Account in accounts table,आपको अकाउंट टेबल में प्रोग्रेस अकाउंट में कैपिटल वर्क का चयन करना होगा,
+You can also set default CWIP account in Company {},आप कंपनी {} में डिफ़ॉल्ट सीडब्ल्यूआईपी खाता भी सेट कर सकते हैं,
+The Request for Quotation can be accessed by clicking on the following button,निम्नलिखित बटन पर क्लिक करके कोटेशन के लिए अनुरोध तक पहुँचा जा सकता है,
+Regards,सादर,
+Please click on the following button to set your new password,अपना नया पासवर्ड सेट करने के लिए कृपया निम्नलिखित बटन पर क्लिक करें,
+Update Password,पासवर्ड अपडेट करें,
+Row #{}: Selling rate for item {} is lower than its {}. Selling {} should be atleast {},"पंक्ति # {}: वस्तु {} के लिए विक्रय दर, इसके {} से कम है। {} बेचना कम से कम {} होना चाहिए",
+You can alternatively disable selling price validation in {} to bypass this validation.,आप वैकल्पिक रूप से इस मान्यता को दरकिनार करने के लिए {} में विक्रय सत्यापन को अक्षम कर सकते हैं।,
+Invalid Selling Price,अवैध विक्रय मूल्य,
+Address needs to be linked to a Company. Please add a row for Company in the Links table.,पता किसी कंपनी से जुड़ा होना चाहिए। कृपया लिंक तालिका में कंपनी के लिए एक पंक्ति जोड़ें।,
+Company Not Linked,कंपनी लिंक नहीं है,
+Import Chart of Accounts from CSV / Excel files,CSV / Excel फ़ाइलों से खातों का आयात चार्ट,
+Completed Qty cannot be greater than 'Qty to Manufacture',पूर्ण मात्रा &#39;Qty to Manufacturing&#39; से बड़ी नहीं हो सकती,
+"Row {0}: For Supplier {1}, Email Address is Required to send an email","पंक्ति {0}: आपूर्तिकर्ता {1} के लिए, ईमेल पता ईमेल भेजने के लिए आवश्यक है",
diff --git a/erpnext/translations/hr.csv b/erpnext/translations/hr.csv
index e23006d..323156b 100644
--- a/erpnext/translations/hr.csv
+++ b/erpnext/translations/hr.csv
@@ -521,7 +521,6 @@
 Chargeble,Chargeble,
 Charges are updated in Purchase Receipt against each item,Optužbe su ažurirani u KUPNJE protiv svake stavke,
 "Charges will be distributed proportionately based on item qty or amount, as per your selection","Troškovi će se distribuirati proporcionalno na temelju točke kom ili iznos, kao i po svom izboru",
-Chart Of Accounts,Kontni plan,
 Chart of Cost Centers,Grafikon troškovnih centara,
 Check all,Provjeri sve,
 Checkout,Provjeri,
@@ -581,7 +580,6 @@
 Compensatory Off,kompenzacijski Off,
 Compensatory leave request days not in valid holidays,Doplativi dopusti za dane naplate nisu u važećem odmoru,
 Complaint,prigovor,
-Completed Qty can not be greater than 'Qty to Manufacture',Završen Qty ne može biti veći od 'Kol proizvoditi',
 Completion Date,Završetak Datum,
 Computer,Računalo,
 Condition,Stanje,
@@ -2033,7 +2031,6 @@
 Please select Charge Type first,Odaberite Naknada za prvi,
 Please select Company,Odaberite tvrtke,
 Please select Company and Designation,Odaberite Tvrtka i Oznaka,
-Please select Company and Party Type first,Odaberite Društvo i Zabava Tip prvi,
 Please select Company and Posting Date to getting entries,Odaberite unos za tvrtku i datum knjiženja,
 Please select Company first,Odaberite tvrtka prvi,
 Please select Completion Date for Completed Asset Maintenance Log,Molimo odaberite Datum završetka za Dovršeni dnevnik održavanja imovine,
@@ -2980,7 +2977,6 @@
 The name of your company for which you are setting up this system.,Ime vaše tvrtke za koje ste postavljanje ovog sustava .,
 The number of shares and the share numbers are inconsistent,Broj dionica i brojeva udjela nedosljedni su,
 The payment gateway account in plan {0} is different from the payment gateway account in this payment request,Račun za gateway plaćanja u planu {0} se razlikuje od računa za pristupnik plaćanja u ovom zahtjevu za plaćanje,
-The request for quotation can be accessed by clicking on the following link,Zahtjev za ponudu se može pristupiti klikom na sljedeći link,
 The selected BOMs are not for the same item,Odabrane sastavnice nisu za istu stavku,
 The selected item cannot have Batch,Izabrani predmet ne može imati Hrpa,
 The seller and the buyer cannot be the same,Prodavatelj i kupac ne mogu biti isti,
@@ -3130,7 +3126,6 @@
 Total flexible benefit component amount {0} should not be less than max benefits {1},Ukupni iznos komponente fleksibilne naknade {0} ne smije biti manji od maksimalnih naknada {1},
 Total hours: {0},Ukupno vrijeme: {0},
 Total leaves allocated is mandatory for Leave Type {0},Ukupni dopušteni dopusti obvezni su za vrstu napuštanja {0},
-Total weightage assigned should be 100%. It is {0},Ukupno bi trebalo biti dodijeljena weightage 100 % . To je {0},
 Total working hours should not be greater than max working hours {0},Ukupno radno vrijeme ne smije biti veći od max radnog vremena {0},
 Total {0} ({1}),Ukupno {0} ({1}),
 "Total {0} for all items is zero, may be you should change 'Distribute Charges Based On'","Ukupno {0} za sve stavke nula, možda biste trebali promijeniti &#39;Podijeliti optužbi na temelju&#39;",
@@ -3544,7 +3539,6 @@
 Company field is required,Polje tvrtke je obavezno,
 Creating Dimensions...,Izrada dimenzija ...,
 Duplicate entry against the item code {0} and manufacturer {1},Duplikat unosa sa šifrom artikla {0} i proizvođačem {1},
-Import Chart Of Accounts from CSV / Excel files,Uvezi račun s računa iz CSV / Excel datoteka,
 Invalid GSTIN! The input you've entered doesn't match the GSTIN format for UIN Holders or Non-Resident OIDAR Service Providers,Nevažeći GSTIN! Uneseni unos ne odgovara formatu GSTIN za vlasnike UIN-a ili nerezidentne davatelje usluga OIDAR-a,
 Invoice Grand Total,Faktura ukupno,
 Last carbon check date cannot be a future date,Posljednji datum provjere ugljika ne može biti budući datum,
@@ -3921,7 +3915,6 @@
 Plaid public token error,Pogreška javnog tokena u obliku video zapisa,
 Plaid transactions sync error,Pogreška sinkronizacije plaidnih transakcija,
 Please check the error log for details about the import errors,Provjerite dnevnik pogrešaka za detalje o uvoznim pogreškama,
-Please click on the following link to set your new password,Molimo kliknite na sljedeći link kako bi postavili novu lozinku,
 Please create <b>DATEV Settings</b> for Company <b>{}</b>.,Izradite <b>DATEV postavke</b> za tvrtku <b>{}</b> .,
 Please create adjustment Journal Entry for amount {0} ,Napravite unos prilagodbe u časopisu za iznos {0},
 Please do not create more than 500 items at a time,Ne stvarajte više od 500 predmeta odjednom,
@@ -3997,6 +3990,7 @@
 Release date must be in the future,Datum izlaska mora biti u budućnosti,
 Relieving Date must be greater than or equal to Date of Joining,Datum oslobađanja mora biti veći ili jednak datumu pridruživanja,
 Rename,Preimenuj,
+Rename Not Allowed,Preimenovanje nije dopušteno,
 Repayment Method is mandatory for term loans,Način otplate je obvezan za oročene kredite,
 Repayment Start Date is mandatory for term loans,Datum početka otplate je obvezan za oročene kredite,
 Report Item,Stavka izvješća,
@@ -4043,7 +4037,6 @@
 Select All,Odaberite sve,
 Select Difference Account,Odaberite račun razlike,
 Select a Default Priority.,Odaberite zadani prioritet.,
-Select a Supplier from the Default Supplier List of the items below.,Odaberite dobavljača sa zadanog popisa dobavljača dolje navedenih stavki.,
 Select a company,Odaberite tvrtku,
 Select finance book for the item {0} at row {1},Odaberite knjigu financija za stavku {0} u retku {1},
 Select only one Priority as Default.,Odaberite samo jedan prioritet kao zadani.,
@@ -4247,7 +4240,6 @@
 Actual ,stvaran,
 Add to cart,Dodaj u košaricu,
 Budget,budžet,
-Chart Of Accounts Importer,Uvoznik računa računa,
 Chart of Accounts,Kontni plan,
 Customer database.,Baza podataka korisnika.,
 Days Since Last order,Dana od posljednje narudžbe,
@@ -4546,7 +4538,6 @@
 Check Supplier Invoice Number Uniqueness,Provjerite Dobavljač Račun broj Jedinstvenost,
 Make Payment via Journal Entry,Plaćanje putem Temeljnica,
 Unlink Payment on Cancellation of Invoice,Prekini vezu Plaćanje o otkazu fakture,
-Unlink Advance Payment on Cancelation of Order,Prekini vezu s predujmom otkazivanja narudžbe,
 Book Asset Depreciation Entry Automatically,Automatski ulazi u amortizaciju imovine u knjizi,
 Automatically Add Taxes and Charges from Item Tax Template,Automatski dodajte poreze i pristojbe sa predloška poreza na stavke,
 Automatically Fetch Payment Terms,Automatski preuzmi Uvjete plaćanja,
@@ -4940,7 +4931,6 @@
 POS Customer Group,POS Korisnička Grupa,
 POS Field,POS polje,
 POS Item Group,POS Točka Grupa,
-[Select],[Odaberi],
 Company Address,adresa tvrtke,
 Update Stock,Ažuriraj zalihe,
 Ignore Pricing Rule,Ignorirajte Cijene pravilo,
@@ -6481,7 +6471,6 @@
 Appraisal Template,Procjena Predložak,
 For Employee Name,Za ime zaposlenika,
 Goals,Golovi,
-Calculate Total Score,Izračunajte ukupni rezultat,
 Total Score (Out of 5),Ukupna ocjena (od 5),
 "Any other remarks, noteworthy effort that should go in the records.","Sve ostale primjedbe, značajan napor da bi trebao ići u evidenciji.",
 Appraisal Goal,Procjena gol,
@@ -6599,11 +6588,6 @@
 Reason for Leaving,Razlog za odlazak,
 Leave Encashed?,Odsustvo naplaćeno?,
 Encashment Date,Encashment Datum,
-Exit Interview Details,Izlaz Intervju Detalji,
-Held On,Održanoj,
-Reason for Resignation,Razlog za ostavku,
-Better Prospects,Bolji izgledi,
-Health Concerns,Zdravlje Zabrinutost,
 New Workplace,Novo radno mjesto,
 HR-EAD-.YYYY.-,HR-EAD-.YYYY.-,
 Returned Amount,Povratni iznos,
@@ -8239,9 +8223,6 @@
 Manufacturers used in Items,Proizvođači se koriste u stavkama,
 Limited to 12 characters,Ograničiti na 12 znakova,
 MAT-MR-.YYYY.-,MAT-MR-.YYYY.-,
-Set Warehouse,Postavite skladište,
-Sets 'For Warehouse' in each row of the Items table.,Postavlja &quot;Za skladište&quot; u svakom retku tablice Predmeti.,
-Requested For,Traženi Za,
 Partially Ordered,Djelomično uređeno,
 Transferred,prebačen,
 % Ordered,% Naručeno,
@@ -8690,8 +8671,6 @@
 Select warehouse for material requests,Odaberite skladište za zahtjeve za materijalom,
 Transfer Materials For Warehouse {0},Prijenos materijala za skladište {0},
 Production Plan Material Request Warehouse,Skladište zahtjeva za planom proizvodnje,
-Set From Warehouse,Postavljeno iz skladišta,
-Source Warehouse (Material Transfer),Izvorno skladište (prijenos materijala),
 Sets 'Source Warehouse' in each row of the items table.,Postavlja &#39;Izvorno skladište&#39; u svaki redak tablice stavki.,
 Sets 'Target Warehouse' in each row of the items table.,Postavlja &#39;Ciljano skladište&#39; u svaki redak tablice stavki.,
 Show Cancelled Entries,Prikaži otkazane unose,
@@ -9157,7 +9136,6 @@
 Is Income Tax Component,Je komponenta poreza na dohodak,
 Component properties and references ,Svojstva i reference komponenata,
 Additional Salary ,Dodatna plaća,
-Condtion and formula,Stanje i formula,
 Unmarked days,Neoznačeni dani,
 Absent Days,Dani odsutnosti,
 Conditions and Formula variable and example,Uvjeti i varijabla formule i primjer,
@@ -9444,7 +9422,6 @@
 Please check your Plaid client ID and secret values,Molimo provjerite svoj ID klijenta i tajne vrijednosti,
 Bank transaction creation error,Pogreška pri stvaranju bankovne transakcije,
 Unit of Measurement,Jedinica mjere,
-Row #{}: Selling rate for item {} is lower than its {}. Selling rate should be atleast {},Redak {{}: Stopa prodaje stavke {} niža je od {}. Stopa prodaje trebala bi biti najmanje {},
 Fiscal Year {0} Does Not Exist,Fiskalna godina {0} ne postoji,
 Row # {0}: Returned Item {1} does not exist in {2} {3},Redak {0}: Vraćena stavka {1} ne postoji u {2} {3},
 Valuation type charges can not be marked as Inclusive,Naknade vrste procjene ne mogu se označiti kao Uključujuće,
@@ -9598,8 +9575,60 @@
 Response Time for {0} priority in row {1} can't be greater than Resolution Time.,Vrijeme odziva za {0} prioritet u retku {1} ne može biti veće od vremena razlučivanja.,
 {0} is not enabled in {1},{0} nije omogućen u {1},
 Group by Material Request,Grupiraj prema zahtjevu za materijal,
-"Row {0}: For Supplier {0}, Email Address is Required to Send Email",Redak {0}: Za dobavljača {0} adresa e-pošte potrebna je za slanje e-pošte,
 Email Sent to Supplier {0},E-pošta poslana dobavljaču {0},
 "The Access to Request for Quotation From Portal is Disabled. To Allow Access, Enable it in Portal Settings.","Pristup zahtjevu za ponudu s portala je onemogućen. Da biste omogućili pristup, omogućite ga u postavkama portala.",
 Supplier Quotation {0} Created,Ponuda dobavljača {0} Izrađena,
 Valid till Date cannot be before Transaction Date,Važi do Datum ne može biti prije datuma transakcije,
+Unlink Advance Payment on Cancellation of Order,Prekinite vezu s predujmom pri otkazivanju narudžbe,
+"Simple Python Expression, Example: territory != 'All Territories'","Jednostavan Python izraz, Primjer: teritorij! = &#39;Svi teritoriji&#39;",
+Sales Contributions and Incentives,Doprinosi prodaji i poticaji,
+Sourced by Supplier,Izvor dobavljača,
+Total weightage assigned should be 100%.<br>It is {0},Ukupna dodijeljena težina trebala bi biti 100%.<br> {0} je,
+Account {0} exists in parent company {1}.,Račun {0} postoji u matičnoj tvrtki {1}.,
+"To overrule this, enable '{0}' in company {1}","Da biste to poništili, omogućite &quot;{0}&quot; u tvrtki {1}",
+Invalid condition expression,Nevažeći izraz stanja,
+Please Select a Company First,Prvo odaberite tvrtku,
+Please Select Both Company and Party Type First,Molimo odaberite prvo vrstu tvrtke i stranke,
+Provide the invoice portion in percent,Dio fakture navedite u postocima,
+Give number of days according to prior selection,Navedite broj dana prema prethodnom odabiru,
+Email Details,Pojedinosti e-pošte,
+"Select a greeting for the receiver. E.g. Mr., Ms., etc.","Odaberite pozdrav za slušalicu. Npr. Gospodin, gospođa itd.",
+Preview Email,Pregled e-pošte,
+Please select a Supplier,Molimo odaberite dobavljača,
+Supplier Lead Time (days),Vrijeme isporuke dobavljača (dana),
+"Home, Work, etc.","Kuća, posao itd.",
+Exit Interview Held On,Izlazni intervju održan,
+Condition and formula,Stanje i formula,
+Sets 'Target Warehouse' in each row of the Items table.,Postavlja &#39;Ciljano skladište&#39; u svaki redak tablice Stavke.,
+Sets 'Source Warehouse' in each row of the Items table.,Postavlja &#39;Izvorno skladište&#39; u svaki redak tablice Stavke.,
+POS Register,POS registar,
+"Can not filter based on POS Profile, if grouped by POS Profile",Ne može se filtrirati na temelju POS profila ako je grupirano po POS profilu,
+"Can not filter based on Customer, if grouped by Customer",Ne može se filtrirati na temelju kupca ako ga je grupirao kupac,
+"Can not filter based on Cashier, if grouped by Cashier","Ne može se filtrirati na temelju blagajne, ako je grupirana po blagajni",
+Payment Method,Način plaćanja,
+"Can not filter based on Payment Method, if grouped by Payment Method",Nije moguće filtrirati na temelju načina plaćanja ako je grupirano prema načinu plaćanja,
+Supplier Quotation Comparison,Usporedba ponuda dobavljača,
+Price per Unit (Stock UOM),Cijena po jedinici (dionica UOM),
+Group by Supplier,Grupiraj prema dobavljaču,
+Group by Item,Grupiraj po stavkama,
+Remember to set {field_label}. It is required by {regulation}.,Ne zaboravite postaviti {field_label}. To zahtijeva {propis}.,
+Enrollment Date cannot be before the Start Date of the Academic Year {0},Datum upisa ne može biti prije datuma početka akademske godine {0},
+Enrollment Date cannot be after the End Date of the Academic Term {0},Datum upisa ne može biti nakon datuma završetka akademskog roka {0},
+Enrollment Date cannot be before the Start Date of the Academic Term {0},Datum upisa ne može biti prije datuma početka akademskog roka {0},
+Posting future transactions are not allowed due to Immutable Ledger,Knjiženje budućih transakcija nije dopušteno zbog Nepromjenjive knjige,
+Future Posting Not Allowed,Objavljivanje u budućnosti nije dozvoljeno,
+"To enable Capital Work in Progress Accounting, ","Da biste omogućili računovodstvo kapitalnog rada u tijeku,",
+you must select Capital Work in Progress Account in accounts table,u tablici računa morate odabrati račun kapitalnog rada u tijeku,
+You can also set default CWIP account in Company {},Također možete postaviti zadani CWIP račun u tvrtki {},
+The Request for Quotation can be accessed by clicking on the following button,Zahtjevu za ponudu možete pristupiti klikom na sljedeći gumb,
+Regards,Pozdrav,
+Please click on the following button to set your new password,Kliknite sljedeći gumb za postavljanje nove lozinke,
+Update Password,Ažuriraj lozinku,
+Row #{}: Selling rate for item {} is lower than its {}. Selling {} should be atleast {},Redak {{}: Stopa prodaje stavke {} niža je od {}. Prodaja {} trebala bi biti najmanje {},
+You can alternatively disable selling price validation in {} to bypass this validation.,Alternativno možete onemogućiti provjeru prodajne cijene u {} da biste zaobišli ovu provjeru.,
+Invalid Selling Price,Nevažeća prodajna cijena,
+Address needs to be linked to a Company. Please add a row for Company in the Links table.,Adresa mora biti povezana s tvrtkom. U tablici veza dodajte redak za tvrtku.,
+Company Not Linked,Tvrtka nije povezana,
+Import Chart of Accounts from CSV / Excel files,Uvoz kontnog plana iz CSV / Excel datoteka,
+Completed Qty cannot be greater than 'Qty to Manufacture',Završena količina ne može biti veća od „Količina za proizvodnju“,
+"Row {0}: For Supplier {1}, Email Address is Required to send an email",Redak {0}: Za dobavljača {1} adresa e-pošte potrebna je za slanje e-pošte,
diff --git a/erpnext/translations/hu.csv b/erpnext/translations/hu.csv
index d4e2216..1624887 100644
--- a/erpnext/translations/hu.csv
+++ b/erpnext/translations/hu.csv
@@ -521,7 +521,6 @@
 Chargeble,Chargeble,
 Charges are updated in Purchase Receipt against each item,Díjak frissülnek a vásárláskor kapott nyugtán a tételek szerint,
 "Charges will be distributed proportionately based on item qty or amount, as per your selection","Díjak arányosan kerülnek kiosztásra a tétel mennyiség vagy összegei alapján, a kiválasztása szerint",
-Chart Of Accounts,Számlatükör,
 Chart of Cost Centers,Költséghelyek listája,
 Check all,Összes ellenőrzése,
 Checkout,kijelentkezés,
@@ -581,7 +580,6 @@
 Compensatory Off,Kompenzációs ki,
 Compensatory leave request days not in valid holidays,Korengedményes szabadságnapok nem az érvényes ünnepnapokon,
 Complaint,Panasz,
-Completed Qty can not be greater than 'Qty to Manufacture',"Befejezett Menny nem lehet nagyobb, mint 'Gyártandó Menny'",
 Completion Date,teljesítési dátum,
 Computer,Számítógép,
 Condition,Feltétel,
@@ -2033,7 +2031,6 @@
 Please select Charge Type first,"Kérjük, válasszon Terhelés típust először",
 Please select Company,"Kérjük, válasszon Vállalkozást először",
 Please select Company and Designation,"Kérjük, válassza a Vállalkozást és a Titulus lehetőséget",
-Please select Company and Party Type first,"Kérjük, válasszon Vállalkozást és Ügyfél típust először",
 Please select Company and Posting Date to getting entries,A bejegyzések beírásához válassza a Cég és a rögzítés dátuma lehetőséget,
 Please select Company first,"Kérjük, válasszon Vállalkozást először",
 Please select Completion Date for Completed Asset Maintenance Log,"Kérem, válassza ki a befejezés dátumát a Befejezett Vagyontárgy gazdálkodási naplóhoz",
@@ -2980,7 +2977,6 @@
 The name of your company for which you are setting up this system.,"A vállalkozásának a neve, amelyre ezt a rendszert beállítja.",
 The number of shares and the share numbers are inconsistent,A részvények száma és a részvények számozása nem konzisztens,
 The payment gateway account in plan {0} is different from the payment gateway account in this payment request,A {0} tervezett fizetési átjáró-fiók eltér a fizetési átjáró fiókjában ebben a fizetési kérelemben,
-The request for quotation can be accessed by clicking on the following link,Az ajánlatkérés elérhető a következő linkre kattintással,
 The selected BOMs are not for the same item,A kiválasztott darabjegyzékeket nem ugyanarra a tételre,
 The selected item cannot have Batch,A kiválasztott elemnek nem lehet Kötege,
 The seller and the buyer cannot be the same,Eladó és a vevő nem lehet ugyanaz,
@@ -3130,7 +3126,6 @@
 Total flexible benefit component amount {0} should not be less than max benefits {1},"A {0} rugalmas juttatási összegek teljes összege nem lehet kevesebb, mint a maximális ellátások {1}",
 Total hours: {0},Összesen az órák: {0},
 Total leaves allocated is mandatory for Leave Type {0},A kihelyezett összes tűvollét kötelező a {0} távollét típushoz,
-Total weightage assigned should be 100%. It is {0},Összesen kijelölés súlyozásának 100% -nak kell lennie. Ez:  {0},
 Total working hours should not be greater than max working hours {0},"Teljes munkaidő nem lehet nagyobb, mint a max munkaidő {0}",
 Total {0} ({1}),Összesen {0} ({1}),
 "Total {0} for all items is zero, may be you should change 'Distribute Charges Based On'","Összesen {0} az összes tételre nulla, lehet, hogy meg kell változtatnia  'Forgalmazói díjak ez alapján'",
@@ -3544,7 +3539,6 @@
 Company field is required,A vállalati mező kitöltése kötelező,
 Creating Dimensions...,Méretek létrehozása ...,
 Duplicate entry against the item code {0} and manufacturer {1},Másolatos bejegyzés a {0} cikkszámhoz és a {1} gyártóhoz,
-Import Chart Of Accounts from CSV / Excel files,Fióktelep importálása CSV / Excel fájlokból,
 Invalid GSTIN! The input you've entered doesn't match the GSTIN format for UIN Holders or Non-Resident OIDAR Service Providers,Érvénytelen GSTIN! A beírt adat nem felel meg a GSTIN formátumnak az UIN-tulajdonosok vagy a nem rezidens OIDAR szolgáltatók esetében,
 Invoice Grand Total,Összesen számla,
 Last carbon check date cannot be a future date,Az utolsó szén-dioxid-ellenőrzési dátum nem lehet jövőbeli dátum,
@@ -3921,7 +3915,6 @@
 Plaid public token error,Nyilvános nyilvános token hiba,
 Plaid transactions sync error,Kockás tranzakciók szinkronizálási hibája,
 Please check the error log for details about the import errors,Ellenőrizze a hibanaplót az importálási hibák részleteivel kapcsolatban,
-Please click on the following link to set your new password,"Kérjük, kattintson az alábbi linkre, az új jelszó beállításához",
 Please create <b>DATEV Settings</b> for Company <b>{}</b>.,"Kérjük, hozzon létre <b>DATEV beállításokat</b> a <b>(z) {} vállalat számára</b> .",
 Please create adjustment Journal Entry for amount {0} ,"Kérjük, hozzon létre korrekciós naplóbejegyzést a (z) {0} összeghez",
 Please do not create more than 500 items at a time,"Kérjük, ne hozzon létre egynél több 500 elemet",
@@ -3997,6 +3990,7 @@
 Release date must be in the future,A kiadás dátumának a jövőben kell lennie,
 Relieving Date must be greater than or equal to Date of Joining,A megváltás dátumának legalább a csatlakozás dátumával kell egyenlőnek lennie,
 Rename,Átnevezés,
+Rename Not Allowed,Átnevezés nem megengedett,
 Repayment Method is mandatory for term loans,A visszafizetési módszer kötelező a lejáratú kölcsönök esetében,
 Repayment Start Date is mandatory for term loans,A visszafizetés kezdete kötelező a lejáratú hiteleknél,
 Report Item,Jelentés elem,
@@ -4043,7 +4037,6 @@
 Select All,Mindent kijelöl,
 Select Difference Account,Válassza a Különbség fiókot,
 Select a Default Priority.,Válasszon alapértelmezett prioritást.,
-Select a Supplier from the Default Supplier List of the items below.,Válasszon szállítót az alábbi tételek alapértelmezett szállító listájából.,
 Select a company,Válasszon társaságot,
 Select finance book for the item {0} at row {1},Válassza ki a {0} tétel pénzügyi könyvét a (z) {1} sorban,
 Select only one Priority as Default.,Csak egy prioritást válasszon alapértelmezésként.,
@@ -4247,7 +4240,6 @@
 Actual ,Tényleges,
 Add to cart,Adja a kosárhoz,
 Budget,Költségkeret,
-Chart Of Accounts Importer,Számlakezelő importőr,
 Chart of Accounts,Számlatükör,
 Customer database.,Ügyféladatbázis.,
 Days Since Last order,Utolsó rendeléstől eltel napok,
@@ -4546,7 +4538,6 @@
 Check Supplier Invoice Number Uniqueness,Ellenőrizze a Beszállítói Számlák számait Egyediségre,
 Make Payment via Journal Entry,Naplókönyvelésen keresztüli befizetés létrehozás,
 Unlink Payment on Cancellation of Invoice,Fizetetlen számlához tartozó Fizetés megszüntetése,
-Unlink Advance Payment on Cancelation of Order,Kapcsolja le az előleget a megrendelés törlésekor,
 Book Asset Depreciation Entry Automatically,Könyv szerinti értékcsökkenés automatikus bejegyzés,
 Automatically Add Taxes and Charges from Item Tax Template,Adók és díjak automatikus hozzáadása az elemadó sablonból,
 Automatically Fetch Payment Terms,A fizetési feltételek automatikus lehívása,
@@ -4940,7 +4931,6 @@
 POS Customer Group,POS Vásárlói csoport,
 POS Field,POS mező,
 POS Item Group,POS tétel csoport,
-[Select],[Válasszon],
 Company Address,Vállalkozás címe,
 Update Stock,Készlet frissítése,
 Ignore Pricing Rule,Árképzési szabály figyelmen kívül hagyása,
@@ -6481,7 +6471,6 @@
 Appraisal Template,Teljesítmény értékelő sablon,
 For Employee Name,Alkalmazott neve,
 Goals,Célok,
-Calculate Total Score,Összes pontszám kiszámolása,
 Total Score (Out of 5),Összes pontszám (5–ből),
 "Any other remarks, noteworthy effort that should go in the records.","Bármely egyéb megjegyzések, említésre méltó erőfeszítés, aminek a nyilvántartásba kell kerülnie.",
 Appraisal Goal,Teljesítmény értékelés célja,
@@ -6599,11 +6588,6 @@
 Reason for Leaving,Kilépés indoka,
 Leave Encashed?,Távollét beváltása?,
 Encashment Date,Beváltás dátuma,
-Exit Interview Details,Interjú részleteiből kilépés,
-Held On,Tartott,
-Reason for Resignation,Felmondás indoka,
-Better Prospects,Jobb kilátások,
-Health Concerns,Egészségügyi problémák,
 New Workplace,Új munkahely,
 HR-EAD-.YYYY.-,HR-EAD-.YYYY.-,
 Returned Amount,Visszatérített összeg,
@@ -8239,9 +8223,6 @@
 Manufacturers used in Items,Gyártókat használt ebben a tételekben,
 Limited to 12 characters,12 karakterre korlátozva,
 MAT-MR-.YYYY.-,MAT-MR-.YYYY.-,
-Set Warehouse,A Warehouse beállítása,
-Sets 'For Warehouse' in each row of the Items table.,Beállítja a „For Warehouse” elemet az Elemek táblázat minden sorában.,
-Requested For,Igény erre,
 Partially Ordered,Részben megrendelt,
 Transferred,Átvitt,
 % Ordered,% Rendezve,
@@ -8690,8 +8671,6 @@
 Select warehouse for material requests,Válassza ki a raktárt az anyagkérésekhez,
 Transfer Materials For Warehouse {0},Anyagok átadása raktárhoz {0},
 Production Plan Material Request Warehouse,Termelési terv Anyagigény-raktár,
-Set From Warehouse,Készlet a raktárból,
-Source Warehouse (Material Transfer),Forrásraktár (anyagátadás),
 Sets 'Source Warehouse' in each row of the items table.,Az elemtábla minden sorában beállítja a „Forrásraktár” elemet.,
 Sets 'Target Warehouse' in each row of the items table.,Az elemtábla minden sorában beállítja a „Célraktár” elemet.,
 Show Cancelled Entries,A törölt bejegyzések megjelenítése,
@@ -9157,7 +9136,6 @@
 Is Income Tax Component,A jövedelemadó-összetevő,
 Component properties and references ,Az alkatrészek tulajdonságai és hivatkozásai,
 Additional Salary ,További fizetés,
-Condtion and formula,Feltétel és képlet,
 Unmarked days,Jelöletlen napok,
 Absent Days,Hiányzó napok,
 Conditions and Formula variable and example,Feltételek és Formula változó és példa,
@@ -9444,7 +9422,6 @@
 Please check your Plaid client ID and secret values,"Kérjük, ellenőrizze Plaid kliens azonosítóját és titkos értékeit",
 Bank transaction creation error,Banki tranzakció létrehozási hiba,
 Unit of Measurement,Mértékegység,
-Row #{}: Selling rate for item {} is lower than its {}. Selling rate should be atleast {},"{}. Sor: A (z) {} elem értékesítési aránya alacsonyabb, mint a (z) {}. Az eladási árfolyamnak legalább {}",
 Fiscal Year {0} Does Not Exist,Pénzügyi év {0} nem létezik,
 Row # {0}: Returned Item {1} does not exist in {2} {3},{0}. Sor: A (z) {1} visszaküldött tétel nem létezik itt: {2} {3},
 Valuation type charges can not be marked as Inclusive,Az értékelési típusú díjak nem jelölhetők befogadónak,
@@ -9598,8 +9575,60 @@
 Response Time for {0} priority in row {1} can't be greater than Resolution Time.,"A {0} {1}. Sor prioritásának válaszideje nem lehet hosszabb, mint a felbontási idő.",
 {0} is not enabled in {1},A (z) {0} nincs engedélyezve itt: {1},
 Group by Material Request,Anyagigény szerinti csoportosítás,
-"Row {0}: For Supplier {0}, Email Address is Required to Send Email",{0} sor: A szállító {0} esetében e-mail cím szükséges az e-mail küldéséhez,
 Email Sent to Supplier {0},E-mail elküldve a beszállítónak {0},
 "The Access to Request for Quotation From Portal is Disabled. To Allow Access, Enable it in Portal Settings.",A portálról történő ajánlatkéréshez való hozzáférés le van tiltva. A hozzáférés engedélyezéséhez engedélyezze a Portal beállításai között.,
 Supplier Quotation {0} Created,Beszállítói ajánlat {0} létrehozva,
 Valid till Date cannot be before Transaction Date,Az érvényes dátum nem lehet korábbi a tranzakció dátumánál,
+Unlink Advance Payment on Cancellation of Order,Válassza le az előleg visszavonását a megrendelés törlésekor,
+"Simple Python Expression, Example: territory != 'All Territories'","Egyszerű Python kifejezés, példa: territoorium! = &#39;Minden terület&#39;",
+Sales Contributions and Incentives,Értékesítési hozzájárulások és ösztönzők,
+Sourced by Supplier,Beszállító által beszerzett,
+Total weightage assigned should be 100%.<br>It is {0},A teljes hozzárendelt súlynak 100% -nak kell lennie.<br> {0},
+Account {0} exists in parent company {1}.,A {0} fiók létezik az anyavállalatnál {1}.,
+"To overrule this, enable '{0}' in company {1}",Ennek felülbírálásához engedélyezze a (z) „{0}” lehetőséget a vállalatnál {1},
+Invalid condition expression,Érvénytelen feltétel kifejezés,
+Please Select a Company First,"Kérjük, először válasszon egy vállalatot",
+Please Select Both Company and Party Type First,"Kérjük, először válassza a Vállalat és a Buli típusát",
+Provide the invoice portion in percent,Adja meg a számla részét százalékban,
+Give number of days according to prior selection,Adja meg a napok számát az előzetes kiválasztás szerint,
+Email Details,E-mail részletei,
+"Select a greeting for the receiver. E.g. Mr., Ms., etc.","Válasszon üdvözletet a vevőnek. Pl. Mr., Ms., stb.",
+Preview Email,E-mail előnézete,
+Please select a Supplier,"Kérjük, válasszon szállítót",
+Supplier Lead Time (days),Szállítói leadási idő (nap),
+"Home, Work, etc.","Otthon, Munkahely stb.",
+Exit Interview Held On,Kilépés az interjúból tartott,
+Condition and formula,Feltétel és képlet,
+Sets 'Target Warehouse' in each row of the Items table.,Beállítja a „Célraktár” elemet az Elemek táblázat minden sorában.,
+Sets 'Source Warehouse' in each row of the Items table.,Beállítja a „Forrásraktár” elemet az Elemek táblázat minden sorában.,
+POS Register,POS regisztráció,
+"Can not filter based on POS Profile, if grouped by POS Profile","Nem lehet POS-profil alapján szűrni, ha POS-profil szerint van csoportosítva",
+"Can not filter based on Customer, if grouped by Customer","Nem lehet az Ügyfél alapján szűrni, ha az Ügyfél csoportosítja",
+"Can not filter based on Cashier, if grouped by Cashier","Nem lehet pénztár alapján szűrni, ha pénztáros csoportosítja",
+Payment Method,Fizetési mód,
+"Can not filter based on Payment Method, if grouped by Payment Method","Nem lehet a Fizetési mód alapján szűrni, ha Fizetési mód szerint van csoportosítva",
+Supplier Quotation Comparison,Beszállítói ajánlat összehasonlítása,
+Price per Unit (Stock UOM),Egységár (készlet UOM),
+Group by Supplier,Szállító szerint csoportosítva,
+Group by Item,Csoportosítás tételenként,
+Remember to set {field_label}. It is required by {regulation}.,Ne felejtse el beállítani a {field_label} mezőt. A {rendelet} előírja.,
+Enrollment Date cannot be before the Start Date of the Academic Year {0},A beiratkozás dátuma nem lehet korábbi a tanév kezdési dátumánál {0},
+Enrollment Date cannot be after the End Date of the Academic Term {0},A beiratkozás dátuma nem lehet későbbi a tanulmányi időszak végének dátumánál {0},
+Enrollment Date cannot be before the Start Date of the Academic Term {0},A beiratkozási dátum nem lehet korábbi a tanulmányi időszak kezdő dátumánál {0},
+Posting future transactions are not allowed due to Immutable Ledger,Jövőbeni tranzakciók könyvelése nem engedélyezhető az Immutable Ledger miatt,
+Future Posting Not Allowed,A jövőbeni közzététel nem engedélyezett,
+"To enable Capital Work in Progress Accounting, ",A tőkemunka folyamatban lévő könyvelésének engedélyezéséhez,
+you must select Capital Work in Progress Account in accounts table,ki kell választania a Folyamatban lévő tőkemunka számlát a számlák táblázatban,
+You can also set default CWIP account in Company {},Alapértelmezett CWIP-fiókot is beállíthat a Vállalatnál {},
+The Request for Quotation can be accessed by clicking on the following button,Az Ajánlatkérés a következő gombra kattintva érhető el,
+Regards,Üdvözlettel,
+Please click on the following button to set your new password,"Kérjük, kattintson a következő gombra az új jelszó beállításához",
+Update Password,Jelszó frissítése,
+Row #{}: Selling rate for item {} is lower than its {}. Selling {} should be atleast {},"{}. Sor: A (z) {} elem értékesítési aránya alacsonyabb, mint a (z) {}. A (z) {} értékesítésnek legalább {} legyen",
+You can alternatively disable selling price validation in {} to bypass this validation.,"Alternatív megoldásként letilthatja az eladási ár érvényesítését itt: {}, hogy ezt az érvényesítést megkerülje.",
+Invalid Selling Price,Érvénytelen eladási ár,
+Address needs to be linked to a Company. Please add a row for Company in the Links table.,"A címet társítani kell egy vállalathoz. Kérjük, adjon meg egy sort a Vállalat számára a Linkek táblában.",
+Company Not Linked,A vállalat nincs összekapcsolva,
+Import Chart of Accounts from CSV / Excel files,Számlatáblázat importálása CSV / Excel fájlokból,
+Completed Qty cannot be greater than 'Qty to Manufacture',"Az elkészült mennyiség nem lehet nagyobb, mint a „gyártási mennyiség”",
+"Row {0}: For Supplier {1}, Email Address is Required to send an email",{0} sor: A szállító {1} esetében e-mail címre van szükség az e-mail küldéséhez,
diff --git a/erpnext/translations/id.csv b/erpnext/translations/id.csv
index 00d167a..227f2e0 100644
--- a/erpnext/translations/id.csv
+++ b/erpnext/translations/id.csv
@@ -521,7 +521,6 @@
 Chargeble,Chargeble,
 Charges are updated in Purchase Receipt against each item,Ongkos dalam Nota Pembelian diperbarui terhadap setiap barang,
 "Charges will be distributed proportionately based on item qty or amount, as per your selection","Biaya akan didistribusikan secara proporsional berdasarkan pada item qty atau jumlah, sesuai pilihan Anda",
-Chart Of Accounts,Bagan Akun,
 Chart of Cost Centers,Bagan Pusat Biaya,
 Check all,Periksa semua,
 Checkout,Periksa,
@@ -581,7 +580,6 @@
 Compensatory Off,Kompensasi Off,
 Compensatory leave request days not in valid holidays,Hari permintaan cuti kompensasi tidak dalam hari libur yang sah,
 Complaint,Keluhan,
-Completed Qty can not be greater than 'Qty to Manufacture',Selesai Qty tidak dapat lebih besar dari 'Jumlah untuk Produksi',
 Completion Date,tanggal penyelesaian,
 Computer,Komputer,
 Condition,Kondisi,
@@ -2033,7 +2031,6 @@
 Please select Charge Type first,Silakan pilih Mengisi Tipe terlebih dahulu,
 Please select Company,Silakan pilih Perusahaan,
 Please select Company and Designation,Silakan pilih Perusahaan dan Penunjukan,
-Please select Company and Party Type first,Silakan pilih Perusahaan dan Partai Jenis terlebih dahulu,
 Please select Company and Posting Date to getting entries,Silakan pilih Perusahaan dan Tanggal Posting untuk mendapatkan entri,
 Please select Company first,Silakan pilih Perusahaan terlebih dahulu,
 Please select Completion Date for Completed Asset Maintenance Log,Silakan pilih Tanggal Penyelesaian untuk Pemeriksaan Pemeliharaan Aset Selesai,
@@ -2980,7 +2977,6 @@
 The name of your company for which you are setting up this system.,Nama perusahaan Anda yang Anda sedang mengatur sistem ini.,
 The number of shares and the share numbers are inconsistent,Jumlah saham dan jumlah saham tidak konsisten,
 The payment gateway account in plan {0} is different from the payment gateway account in this payment request,Akun gateway pembayaran dalam rencana {0} berbeda dari akun gateway pembayaran dalam permintaan pembayaran ini,
-The request for quotation can be accessed by clicking on the following link,Permintaan untuk kutipan dapat diakses dengan mengklik link berikut,
 The selected BOMs are not for the same item,BOMs yang dipilih tidak untuk item yang sama,
 The selected item cannot have Batch,Item yang dipilih tidak dapat memiliki Batch,
 The seller and the buyer cannot be the same,Penjual dan pembeli tidak bisa sama,
@@ -3130,7 +3126,6 @@
 Total flexible benefit component amount {0} should not be less than max benefits {1},Total jumlah komponen manfaat fleksibel {0} tidak boleh kurang dari manfaat maksimal {1},
 Total hours: {0},Jumlah jam: {0},
 Total leaves allocated is mandatory for Leave Type {0},Total cuti yang dialokasikan adalah wajib untuk Tipe Cuti {0},
-Total weightage assigned should be 100%. It is {0},Jumlah weightage ditugaskan harus 100%. Ini adalah {0},
 Total working hours should not be greater than max working hours {0},Jumlah jam kerja tidak boleh lebih besar dari max jam kerja {0},
 Total {0} ({1}),Total {0} ({1}),
 "Total {0} for all items is zero, may be you should change 'Distribute Charges Based On'","Total {0} untuk semua item adalah nol, mungkin Anda harus mengubah &#39;Distribusikan Biaya Berdasarkan&#39;",
@@ -3544,7 +3539,6 @@
 Company field is required,Bidang perusahaan wajib diisi,
 Creating Dimensions...,Membuat Dimensi ...,
 Duplicate entry against the item code {0} and manufacturer {1},Entri duplikat terhadap kode item {0} dan pabrikan {1},
-Import Chart Of Accounts from CSV / Excel files,Impor Bagan Akun dari file CSV / Excel,
 Invalid GSTIN! The input you've entered doesn't match the GSTIN format for UIN Holders or Non-Resident OIDAR Service Providers,GSTIN tidak valid! Input yang Anda masukkan tidak cocok dengan format GSTIN untuk Pemegang UIN atau Penyedia Layanan OIDAR Non-Resident,
 Invoice Grand Total,Faktur Jumlah Total,
 Last carbon check date cannot be a future date,Tanggal pemeriksaan karbon terakhir tidak bisa menjadi tanggal di masa depan,
@@ -3921,7 +3915,6 @@
 Plaid public token error,Kesalahan token publik kotak-kotak,
 Plaid transactions sync error,Kesalahan sinkronisasi transaksi kotak-kotak,
 Please check the error log for details about the import errors,Silakan periksa log kesalahan untuk detail tentang kesalahan impor,
-Please click on the following link to set your new password,Silahkan klik pada link berikut untuk mengatur password baru anda,
 Please create <b>DATEV Settings</b> for Company <b>{}</b>.,Harap buat <b>Pengaturan DATEV</b> untuk Perusahaan <b>{}</b> .,
 Please create adjustment Journal Entry for amount {0} ,Harap buat penyesuaian Entri Jurnal untuk jumlah {0},
 Please do not create more than 500 items at a time,Tolong jangan membuat lebih dari 500 item sekaligus,
@@ -3997,6 +3990,7 @@
 Release date must be in the future,Tanggal rilis harus di masa mendatang,
 Relieving Date must be greater than or equal to Date of Joining,Tanggal pelepasan harus lebih besar dari atau sama dengan Tanggal Bergabung,
 Rename,Ubah nama,
+Rename Not Allowed,Ganti nama Tidak Diizinkan,
 Repayment Method is mandatory for term loans,Metode Pembayaran wajib untuk pinjaman berjangka,
 Repayment Start Date is mandatory for term loans,Tanggal Mulai Pembayaran wajib untuk pinjaman berjangka,
 Report Item,Laporkan Item,
@@ -4043,7 +4037,6 @@
 Select All,Pilih semua,
 Select Difference Account,Pilih Perbedaan Akun,
 Select a Default Priority.,Pilih Prioritas Default.,
-Select a Supplier from the Default Supplier List of the items below.,Pilih Pemasok dari Daftar Pemasok Default untuk item di bawah ini.,
 Select a company,Pilih perusahaan,
 Select finance book for the item {0} at row {1},Pilih buku keuangan untuk item {0} di baris {1},
 Select only one Priority as Default.,Pilih hanya satu Prioritas sebagai Default.,
@@ -4247,7 +4240,6 @@
 Actual ,Aktual,
 Add to cart,Tambahkan ke Keranjang Belanja,
 Budget,Anggaran belanja,
-Chart Of Accounts Importer,Grafik Pengimpor Akun,
 Chart of Accounts,Bagan Akun,
 Customer database.,Database Pelanggan.,
 Days Since Last order,Hari Sejak Pemesanan Terakhir,
@@ -4546,7 +4538,6 @@
 Check Supplier Invoice Number Uniqueness,Periksa keunikan nomor Faktur Supplier,
 Make Payment via Journal Entry,Lakukan Pembayaran via Journal Entri,
 Unlink Payment on Cancellation of Invoice,Membatalkan tautan Pembayaran pada Pembatalan Faktur,
-Unlink Advance Payment on Cancelation of Order,Putuskan Tautan Pembayaran Muka pada Pembatalan pesanan,
 Book Asset Depreciation Entry Automatically,Rekam Entri Depresiasi Asset secara Otomatis,
 Automatically Add Taxes and Charges from Item Tax Template,Secara otomatis Menambahkan Pajak dan Tagihan dari Item Pajak Template,
 Automatically Fetch Payment Terms,Ambil Ketentuan Pembayaran secara otomatis,
@@ -4940,7 +4931,6 @@
 POS Customer Group,POS Pelanggan Grup,
 POS Field,Bidang POS,
 POS Item Group,POS Barang Grup,
-[Select],[Pilih],
 Company Address,Alamat perusahaan,
 Update Stock,Perbarui Persediaan,
 Ignore Pricing Rule,Abaikan Aturan Harga,
@@ -6481,7 +6471,6 @@
 Appraisal Template,Template Penilaian,
 For Employee Name,Untuk Nama Karyawan,
 Goals,tujuan,
-Calculate Total Score,Hitung Total Skor,
 Total Score (Out of 5),Skor Total (Out of 5),
 "Any other remarks, noteworthy effort that should go in the records.","Setiap komentar lain, upaya penting yang harus pergi dalam catatan.",
 Appraisal Goal,Penilaian Pencapaian,
@@ -6599,11 +6588,6 @@
 Reason for Leaving,Alasan Meninggalkan,
 Leave Encashed?,Cuti dicairkan?,
 Encashment Date,Pencairan Tanggal,
-Exit Interview Details,Detail Exit Interview,
-Held On,Diadakan Pada,
-Reason for Resignation,Alasan pengunduran diri,
-Better Prospects,Prospek yang Lebih Baik,
-Health Concerns,Kekhawatiran Kesehatan,
 New Workplace,Tempat Kerja Baru,
 HR-EAD-.YYYY.-,HR-EAD-.YYYY.-,
 Returned Amount,Jumlah yang dikembalikan,
@@ -8239,9 +8223,6 @@
 Manufacturers used in Items,Produsen yang digunakan dalam Produk,
 Limited to 12 characters,Terbatas untuk 12 karakter,
 MAT-MR-.YYYY.-,MAT-MR-.YYYY.-,
-Set Warehouse,Atur Gudang,
-Sets 'For Warehouse' in each row of the Items table.,Set &#39;Untuk Gudang&#39; di setiap baris tabel Item.,
-Requested For,Diminta Untuk,
 Partially Ordered,Dipesan Sebagian,
 Transferred,Ditransfer,
 % Ordered,% Tersusun,
@@ -8690,8 +8671,6 @@
 Select warehouse for material requests,Pilih gudang untuk permintaan material,
 Transfer Materials For Warehouse {0},Mentransfer Bahan Untuk Gudang {0},
 Production Plan Material Request Warehouse,Gudang Permintaan Material Rencana Produksi,
-Set From Warehouse,Atur Dari Gudang,
-Source Warehouse (Material Transfer),Gudang Sumber (Transfer Material),
 Sets 'Source Warehouse' in each row of the items table.,Set &#39;Source Warehouse&#39; di setiap baris tabel item.,
 Sets 'Target Warehouse' in each row of the items table.,Menetapkan &#39;Gudang Target&#39; di setiap baris tabel item.,
 Show Cancelled Entries,Tunjukkan Entri yang Dibatalkan,
@@ -9157,7 +9136,6 @@
 Is Income Tax Component,Adalah Komponen Pajak Penghasilan,
 Component properties and references ,Properti dan referensi komponen,
 Additional Salary ,Gaji Tambahan,
-Condtion and formula,Condtion dan formula,
 Unmarked days,Hari tak bertanda,
 Absent Days,Hari Absen,
 Conditions and Formula variable and example,Kondisi dan variabel Rumus dan contoh,
@@ -9444,7 +9422,6 @@
 Please check your Plaid client ID and secret values,Harap periksa ID klien Kotak-kotak dan nilai rahasia Anda,
 Bank transaction creation error,Kesalahan pembuatan transaksi bank,
 Unit of Measurement,Satuan Pengukuran,
-Row #{}: Selling rate for item {} is lower than its {}. Selling rate should be atleast {},Baris # {}: Tarif jual item {} lebih rendah daripada {}. Tingkat penjualan harus minimal {},
 Fiscal Year {0} Does Not Exist,Tahun Fiskal {0} Tidak Ada,
 Row # {0}: Returned Item {1} does not exist in {2} {3},Baris # {0}: Item yang Dikembalikan {1} tidak ada di {2} {3},
 Valuation type charges can not be marked as Inclusive,Biaya jenis penilaian tidak dapat ditandai sebagai Inklusif,
@@ -9598,8 +9575,60 @@
 Response Time for {0} priority in row {1} can't be greater than Resolution Time.,Waktu Respons untuk {0} prioritas di baris {1} tidak boleh lebih dari Waktu Resolusi.,
 {0} is not enabled in {1},{0} tidak diaktifkan di {1},
 Group by Material Request,Kelompokkan berdasarkan Permintaan Material,
-"Row {0}: For Supplier {0}, Email Address is Required to Send Email","Baris {0}: Untuk Pemasok {0}, Alamat Email Diperlukan untuk Mengirim Email",
 Email Sent to Supplier {0},Email Dikirim ke Pemasok {0},
 "The Access to Request for Quotation From Portal is Disabled. To Allow Access, Enable it in Portal Settings.","Akses ke Permintaan Penawaran Dari Portal Dinonaktifkan. Untuk Mengizinkan Akses, Aktifkan di Pengaturan Portal.",
 Supplier Quotation {0} Created,Penawaran Pemasok {0} Dibuat,
 Valid till Date cannot be before Transaction Date,Berlaku hingga Tanggal tidak boleh sebelum Tanggal Transaksi,
+Unlink Advance Payment on Cancellation of Order,Batalkan Tautan Pembayaran Di Muka pada Pembatalan Pesanan,
+"Simple Python Expression, Example: territory != 'All Territories'","Ekspresi Python Sederhana, Contoh: teritori! = &#39;Semua Wilayah&#39;",
+Sales Contributions and Incentives,Kontribusi Penjualan dan Insentif,
+Sourced by Supplier,Bersumber dari Pemasok,
+Total weightage assigned should be 100%.<br>It is {0},Bobot total yang ditetapkan harus 100%.<br> Ini adalah {0},
+Account {0} exists in parent company {1}.,Akun {0} ada di perusahaan induk {1}.,
+"To overrule this, enable '{0}' in company {1}","Untuk mengesampingkan ini, aktifkan &#39;{0}&#39; di perusahaan {1}",
+Invalid condition expression,Ekspresi kondisi tidak valid,
+Please Select a Company First,Harap Pilih Perusahaan Terlebih Dahulu,
+Please Select Both Company and Party Type First,Harap Pilih Kedua Perusahaan dan Jenis Pesta Pertama,
+Provide the invoice portion in percent,Berikan porsi faktur dalam persen,
+Give number of days according to prior selection,Beri jumlah hari menurut seleksi sebelumnya,
+Email Details,Rincian Email,
+"Select a greeting for the receiver. E.g. Mr., Ms., etc.","Pilih salam untuk penerima. Misal Mr., Ms., dll.",
+Preview Email,Pratinjau Email,
+Please select a Supplier,Silakan pilih a Pemasok,
+Supplier Lead Time (days),Supplier Lead Time (hari),
+"Home, Work, etc.","Rumah, Kantor, dll.",
+Exit Interview Held On,Exit Interview Diadakan,
+Condition and formula,Kondisi dan formula,
+Sets 'Target Warehouse' in each row of the Items table.,Set &#39;Gudang Target&#39; di setiap baris tabel Item.,
+Sets 'Source Warehouse' in each row of the Items table.,Set &#39;Source Warehouse&#39; di setiap baris tabel Item.,
+POS Register,Daftar POS,
+"Can not filter based on POS Profile, if grouped by POS Profile","Tidak dapat memfilter berdasarkan Profil POS, jika dikelompokkan berdasarkan Profil POS",
+"Can not filter based on Customer, if grouped by Customer","Tidak dapat memfilter berdasarkan Pelanggan, jika dikelompokkan berdasarkan Pelanggan",
+"Can not filter based on Cashier, if grouped by Cashier","Tidak dapat memfilter berdasarkan Kasir, jika dikelompokkan berdasarkan Kasir",
+Payment Method,Cara Pembayaran,
+"Can not filter based on Payment Method, if grouped by Payment Method","Tidak dapat memfilter berdasarkan Metode Pembayaran, jika dikelompokkan berdasarkan Metode Pembayaran",
+Supplier Quotation Comparison,Perbandingan Penawaran Pemasok,
+Price per Unit (Stock UOM),Harga per Unit (Stock UOM),
+Group by Supplier,Kelompokkan berdasarkan Pemasok,
+Group by Item,Kelompokkan berdasarkan Item,
+Remember to set {field_label}. It is required by {regulation}.,Ingatlah untuk menyetel {field_label}. Ini diwajibkan oleh {regulasi}.,
+Enrollment Date cannot be before the Start Date of the Academic Year {0},Tanggal Pendaftaran tidak boleh sebelum Tanggal Mulai Tahun Akademik {0},
+Enrollment Date cannot be after the End Date of the Academic Term {0},Tanggal Pendaftaran tidak boleh setelah Tanggal Akhir Masa Akademik {0},
+Enrollment Date cannot be before the Start Date of the Academic Term {0},Tanggal Pendaftaran tidak boleh sebelum Tanggal Mulai dari Syarat Akademik {0},
+Posting future transactions are not allowed due to Immutable Ledger,Memposting transaksi di masa depan tidak diperbolehkan karena Immutable Ledger,
+Future Posting Not Allowed,Posting Mendatang Tidak Diizinkan,
+"To enable Capital Work in Progress Accounting, ","Untuk mengaktifkan Capital Work dalam Progress Accounting,",
+you must select Capital Work in Progress Account in accounts table,Anda harus memilih Capital Work in Progress Account di tabel akun,
+You can also set default CWIP account in Company {},Anda juga dapat menyetel akun CWIP default di Perusahaan {},
+The Request for Quotation can be accessed by clicking on the following button,Permintaan Penawaran dapat diakses dengan mengklik tombol berikut,
+Regards,Salam,
+Please click on the following button to set your new password,Silakan klik tombol berikut untuk menyetel kata sandi baru Anda,
+Update Password,Perbarui Kata Sandi,
+Row #{}: Selling rate for item {} is lower than its {}. Selling {} should be atleast {},Baris # {}: Tarif jual item {} lebih rendah daripada {}. Menjual {} harus minimal {},
+You can alternatively disable selling price validation in {} to bypass this validation.,Anda juga bisa menonaktifkan validasi harga jual di {} untuk melewati validasi ini.,
+Invalid Selling Price,Harga Jual Tidak Valid,
+Address needs to be linked to a Company. Please add a row for Company in the Links table.,Alamat harus ditautkan ke Perusahaan. Harap tambahkan baris untuk Perusahaan di tabel Tautan.,
+Company Not Linked,Perusahaan Tidak Tertaut,
+Import Chart of Accounts from CSV / Excel files,Impor Bagan Akun dari file CSV / Excel,
+Completed Qty cannot be greater than 'Qty to Manufacture',Kuantitas Lengkap tidak boleh lebih besar dari &#39;Kuantitas hingga Pembuatan&#39;,
+"Row {0}: For Supplier {1}, Email Address is Required to send an email","Baris {0}: Untuk Pemasok {1}, Alamat Email Diperlukan untuk mengirim email",
diff --git a/erpnext/translations/is.csv b/erpnext/translations/is.csv
index b7984c9..1e1356d 100644
--- a/erpnext/translations/is.csv
+++ b/erpnext/translations/is.csv
@@ -521,7 +521,6 @@
 Chargeble,Gjaldtaka,
 Charges are updated in Purchase Receipt against each item,Gjöld eru uppfærðar á kvittun við hvert atriði,
 "Charges will be distributed proportionately based on item qty or amount, as per your selection","Gjöld verður dreift hlutfallslega miðað hlut Fjöldi eða magn, eins og á val þitt",
-Chart Of Accounts,Mynd reikninga,
 Chart of Cost Centers,Mynd af stoðsviða,
 Check all,Athugaðu alla,
 Checkout,Athuga,
@@ -581,7 +580,6 @@
 Compensatory Off,jöfnunaraðgerðir Off,
 Compensatory leave request days not in valid holidays,Dagbætur vegna bótaábyrgðar ekki í gildum frídagum,
 Complaint,Kvörtun,
-Completed Qty can not be greater than 'Qty to Manufacture',Lokið Magn má ekki vera meiri en &#39;Magn í Manufacture&#39;,
 Completion Date,Verklok,
 Computer,Tölva,
 Condition,Ástand,
@@ -2033,7 +2031,6 @@
 Please select Charge Type first,Vinsamlegast veldu Charge Tegund fyrst,
 Please select Company,Vinsamlegast veldu Company,
 Please select Company and Designation,Vinsamlegast veldu fyrirtæki og tilnefningu,
-Please select Company and Party Type first,Vinsamlegast veldu Company og Party Gerð fyrst,
 Please select Company and Posting Date to getting entries,Vinsamlegast veldu félags og póstsetningu til að fá færslur,
 Please select Company first,Vinsamlegast veldu Company fyrst,
 Please select Completion Date for Completed Asset Maintenance Log,Vinsamlegast veldu Lokadagsetning fyrir lokaðan rekstrarskrá,
@@ -2980,7 +2977,6 @@
 The name of your company for which you are setting up this system.,Nafn fyrirtækis þíns sem þú ert að setja upp þetta kerfi.,
 The number of shares and the share numbers are inconsistent,Fjöldi hluta og hlutanúmer eru ósamræmi,
 The payment gateway account in plan {0} is different from the payment gateway account in this payment request,Greiðslugátt reikningsins í áætluninni {0} er frábrugðin greiðslugáttarkonto í þessari greiðslubeiðni,
-The request for quotation can be accessed by clicking on the following link,Beiðni um tilvitnun er hægt að nálgast með því að smella á eftirfarandi tengil,
 The selected BOMs are not for the same item,Völdu BOMs eru ekki fyrir sama hlut,
 The selected item cannot have Batch,Valið atriði getur ekki Hópur,
 The seller and the buyer cannot be the same,Seljandi og kaupandi geta ekki verið þau sömu,
@@ -3130,7 +3126,6 @@
 Total flexible benefit component amount {0} should not be less than max benefits {1},Heildarupphæð sveigjanlegs ávinningshluta {0} ætti ekki að vera minni en hámarksbætur {1},
 Total hours: {0},Total hours: {0},
 Total leaves allocated is mandatory for Leave Type {0},Heildarlaun úthlutað er nauðsynlegt fyrir Leyfi Type {0},
-Total weightage assigned should be 100%. It is {0},Alls weightage úthlutað ætti að vera 100%. Það er {0},
 Total working hours should not be greater than max working hours {0},Samtals vinnutími ætti ekki að vera meiri en max vinnutíma {0},
 Total {0} ({1}),Alls {0} ({1}),
 "Total {0} for all items is zero, may be you should change 'Distribute Charges Based On'","Alls {0} á öllum hlutum er núll, getur verið að þú ættir að breyta &#39;Úthluta Gjöld Byggt á&#39;",
@@ -3544,7 +3539,6 @@
 Company field is required,Fyrirtækjasvið er krafist,
 Creating Dimensions...,Býr til víddir ...,
 Duplicate entry against the item code {0} and manufacturer {1},Afrit færslu gegn vörukóðanum {0} og framleiðanda {1},
-Import Chart Of Accounts from CSV / Excel files,Flytja inn reikningskort úr CSV / Excel skrám,
 Invalid GSTIN! The input you've entered doesn't match the GSTIN format for UIN Holders or Non-Resident OIDAR Service Providers,Ógilt GSTIN! Inntakið sem þú slóst inn passar ekki við GSTIN snið fyrir UIN handhafa eða OIDAR þjónustuaðila sem eru ekki búsettir,
 Invoice Grand Total,Heildarfjárhæð reikninga,
 Last carbon check date cannot be a future date,Síðasti dagsetning kolefnisrannsóknar getur ekki verið framtíðardagsetning,
@@ -3921,7 +3915,6 @@
 Plaid public token error,Villa við almenna táknið,
 Plaid transactions sync error,Villa við samstillingu Plaid viðskipti,
 Please check the error log for details about the import errors,Vinsamlegast athugaðu villubókina til að fá upplýsingar um innflutningsvillurnar,
-Please click on the following link to set your new password,Vinsamlegast smelltu á eftirfarandi tengil til að setja nýja lykilorðið þitt,
 Please create <b>DATEV Settings</b> for Company <b>{}</b>.,Vinsamlegast búðu til <b>DATEV stillingar</b> fyrir fyrirtæki <b>{}</b> .,
 Please create adjustment Journal Entry for amount {0} ,Vinsamlegast stofnaðu færslu dagbókar fyrir upphæð {0},
 Please do not create more than 500 items at a time,Vinsamlegast ekki búa til meira en 500 hluti í einu,
@@ -3997,6 +3990,7 @@
 Release date must be in the future,Útgáfudagur verður að vera í framtíðinni,
 Relieving Date must be greater than or equal to Date of Joining,Slökunardagur verður að vera meiri en eða jafn og dagsetningardagur,
 Rename,endurnefna,
+Rename Not Allowed,Endurnefna ekki leyfilegt,
 Repayment Method is mandatory for term loans,Endurgreiðsluaðferð er skylda fyrir tíma lán,
 Repayment Start Date is mandatory for term loans,Upphafsdagur endurgreiðslu er skylda vegna lánstíma,
 Report Item,Tilkynna hlut,
@@ -4043,7 +4037,6 @@
 Select All,Velja allt,
 Select Difference Account,Veldu mismunareikning,
 Select a Default Priority.,Veldu sjálfgefið forgang.,
-Select a Supplier from the Default Supplier List of the items below.,Veldu seljanda úr sjálfgefnum birgðalista yfir hlutina hér að neðan.,
 Select a company,Veldu fyrirtæki,
 Select finance book for the item {0} at row {1},Veldu fjármálabók fyrir hlutinn {0} í röð {1},
 Select only one Priority as Default.,Veldu aðeins eitt forgang sem sjálfgefið.,
@@ -4247,7 +4240,6 @@
 Actual ,Raunveruleg,
 Add to cart,Bæta í körfu,
 Budget,Budget,
-Chart Of Accounts Importer,Yfirlit yfir innflutning reikninga,
 Chart of Accounts,Yfirlit yfir reikninga,
 Customer database.,Viðskiptavinur Gagnagrunnur.,
 Days Since Last order,Dagar frá síðustu Order,
@@ -4546,7 +4538,6 @@
 Check Supplier Invoice Number Uniqueness,Athuga Birgir Reikningur númer Sérstöðu,
 Make Payment via Journal Entry,Greiða í gegnum dagbókarfærslu,
 Unlink Payment on Cancellation of Invoice,Aftengja greiðsla á niðurfellingar Invoice,
-Unlink Advance Payment on Cancelation of Order,Taktu úr sambandi fyrirframgreiðslu vegna niðurfellingar pöntunar,
 Book Asset Depreciation Entry Automatically,Bókfært eignaaukning sjálfkrafa,
 Automatically Add Taxes and Charges from Item Tax Template,Bættu sjálfkrafa við sköttum og gjöldum af sniðmáti hlutarskatta,
 Automatically Fetch Payment Terms,Sæktu sjálfkrafa greiðsluskilmála,
@@ -4940,7 +4931,6 @@
 POS Customer Group,POS viðskiptavinar Group,
 POS Field,POS sviði,
 POS Item Group,POS Item Group,
-[Select],[Veldu],
 Company Address,Nafn fyrirtækis,
 Update Stock,Uppfæra Stock,
 Ignore Pricing Rule,Hunsa Verðlagning reglu,
@@ -6481,7 +6471,6 @@
 Appraisal Template,Úttekt Snið,
 For Employee Name,Fyrir Starfsmannafélag Nafn,
 Goals,mörk,
-Calculate Total Score,Reikna aðaleinkunn,
 Total Score (Out of 5),Total Score (af 5),
 "Any other remarks, noteworthy effort that should go in the records.","Allar aðrar athugasemdir, athyglisvert áreynsla sem ætti að fara í skrám.",
 Appraisal Goal,Úttekt Goal,
@@ -6599,11 +6588,6 @@
 Reason for Leaving,Ástæða til að fara,
 Leave Encashed?,Leyfi Encashed?,
 Encashment Date,Encashment Dagsetning,
-Exit Interview Details,Hætta Viðtal Upplýsingar,
-Held On,Hélt í,
-Reason for Resignation,Ástæðan fyrir úrsögn,
-Better Prospects,betri horfur,
-Health Concerns,Heilsa Áhyggjuefni,
 New Workplace,ný Vinnustaðurinn,
 HR-EAD-.YYYY.-,HR-EAD-.YYYY.-,
 Returned Amount,Skilað upphæð,
@@ -8239,9 +8223,6 @@
 Manufacturers used in Items,Framleiðendur notað í liðum,
 Limited to 12 characters,Takmarkast við 12 stafi,
 MAT-MR-.YYYY.-,MAT-MR-.YYYY.-,
-Set Warehouse,Setja vöruhús,
-Sets 'For Warehouse' in each row of the Items table.,Stillir &#39;Fyrir vöruhús&#39; í hverri röð hlutatöflunnar.,
-Requested For,Umbeðin Fyrir,
 Partially Ordered,Að hluta til pantað,
 Transferred,Flutt,
 % Ordered,% Pantaði,
@@ -8690,8 +8671,6 @@
 Select warehouse for material requests,Veldu lager fyrir efnisbeiðnir,
 Transfer Materials For Warehouse {0},Flytja efni fyrir lager {0},
 Production Plan Material Request Warehouse,Vöruhús fyrir framleiðsluáætlun,
-Set From Warehouse,Sett frá vörugeymslu,
-Source Warehouse (Material Transfer),Upprunavöruhús (efnisflutningur),
 Sets 'Source Warehouse' in each row of the items table.,Stillir &#39;Source Warehouse&#39; í hverri röð hlutatöflunnar.,
 Sets 'Target Warehouse' in each row of the items table.,Stillir &#39;Target Warehouse&#39; í hverri röð hlutatöflunnar.,
 Show Cancelled Entries,Sýna færslur sem falla niður,
@@ -9157,7 +9136,6 @@
 Is Income Tax Component,Er hluti tekjuskatts,
 Component properties and references ,Hluti eiginleika og tilvísanir,
 Additional Salary ,Viðbótarlaun,
-Condtion and formula,Leiðsla og uppskrift,
 Unmarked days,Ómerktir dagar,
 Absent Days,Fjarverandi dagar,
 Conditions and Formula variable and example,Aðstæður og formúlubreytur og dæmi,
@@ -9444,7 +9422,6 @@
 Please check your Plaid client ID and secret values,Vinsamlegast athugaðu auðkenni viðskiptavinar þíns og leynileg gildi,
 Bank transaction creation error,Villa við að búa til bankaviðskipti,
 Unit of Measurement,Mælieining,
-Row #{}: Selling rate for item {} is lower than its {}. Selling rate should be atleast {},Röð nr. {}: Sölugengi hlutar {} er lægra en {} þess. Söluhlutfall ætti að vera að minnsta kosti {},
 Fiscal Year {0} Does Not Exist,Reikningsár {0} er ekki til,
 Row # {0}: Returned Item {1} does not exist in {2} {3},Röð nr. {0}: Atriði sem skilað er {1} er ekki til í {2} {3},
 Valuation type charges can not be marked as Inclusive,Ekki er hægt að merkja gjald fyrir verðmæti sem innifalið,
@@ -9598,8 +9575,60 @@
 Response Time for {0} priority in row {1} can't be greater than Resolution Time.,Svartími fyrir {0} forgang í röð {1} getur ekki verið meiri en Upplausnartími.,
 {0} is not enabled in {1},{0} er ekki virkt í {1},
 Group by Material Request,Flokkað eftir efnisbeiðni,
-"Row {0}: For Supplier {0}, Email Address is Required to Send Email",Röð {0}: Fyrir birgjann {0} þarf netfang til að senda tölvupóst,
 Email Sent to Supplier {0},Tölvupóstur sendur til birgja {0},
 "The Access to Request for Quotation From Portal is Disabled. To Allow Access, Enable it in Portal Settings.","Aðgangur að beiðni um tilboð frá gátt er óvirkur. Til að leyfa aðgang, virkjaðu það í Portal Settings.",
 Supplier Quotation {0} Created,Tilboð í birgja {0} búið til,
 Valid till Date cannot be before Transaction Date,Gild til dagsetning getur ekki verið fyrir viðskiptadagsetningu,
+Unlink Advance Payment on Cancellation of Order,Aftengja fyrirframgreiðslu við afturköllun pöntunar,
+"Simple Python Expression, Example: territory != 'All Territories'","Einföld Python-tjáning, dæmi: territorium! = &#39;All Territories&#39;",
+Sales Contributions and Incentives,Söluframlag og hvatning,
+Sourced by Supplier,Upprunnið af birgi,
+Total weightage assigned should be 100%.<br>It is {0},Heildarþyngd úthlutað ætti að vera 100%.<br> Það er {0},
+Account {0} exists in parent company {1}.,Reikningurinn {0} er til í móðurfélaginu {1}.,
+"To overrule this, enable '{0}' in company {1}",Til að ofsækja þetta skaltu virkja &#39;{0}&#39; í fyrirtæki {1},
+Invalid condition expression,Ógild ástandstjáning,
+Please Select a Company First,Vinsamlegast veldu fyrirtæki fyrst,
+Please Select Both Company and Party Type First,Vinsamlegast veldu bæði fyrirtæki og tegund aðila fyrst,
+Provide the invoice portion in percent,Gefðu upp reikningshlutann í prósentum,
+Give number of days according to prior selection,Gefðu upp fjölda daga samkvæmt forvali,
+Email Details,Upplýsingar um tölvupóst,
+"Select a greeting for the receiver. E.g. Mr., Ms., etc.","Veldu kveðju fyrir móttakara. Til dæmis herra, frú o.s.frv.",
+Preview Email,Forskoða tölvupóst,
+Please select a Supplier,Vinsamlegast veldu birgir,
+Supplier Lead Time (days),Leiðslutími birgja (dagar),
+"Home, Work, etc.","Heimili, vinna o.s.frv.",
+Exit Interview Held On,Útgönguviðtal haldið,
+Condition and formula,Ástand og uppskrift,
+Sets 'Target Warehouse' in each row of the Items table.,Stillir &#39;Target Warehouse&#39; í hverri röð hlutatöflunnar.,
+Sets 'Source Warehouse' in each row of the Items table.,Stillir &#39;Source Warehouse&#39; í hverri röð hlutatöflunnar.,
+POS Register,POS skrá,
+"Can not filter based on POS Profile, if grouped by POS Profile","Get ekki síað eftir POS prófíl, ef flokkað er eftir POS prófíl",
+"Can not filter based on Customer, if grouped by Customer","Get ekki síað eftir viðskiptavini, ef flokkað er eftir viðskiptavini",
+"Can not filter based on Cashier, if grouped by Cashier","Get ekki síað eftir gjaldkera, ef flokkað er eftir gjaldkera",
+Payment Method,Greiðslumáti,
+"Can not filter based on Payment Method, if grouped by Payment Method","Get ekki síað eftir greiðslumáta, ef það er flokkað eftir greiðslumáta",
+Supplier Quotation Comparison,Samanburður á tilboði birgja,
+Price per Unit (Stock UOM),Verð á hverja einingu (lager UOM),
+Group by Supplier,Flokkað eftir birgi,
+Group by Item,Flokkað eftir liðum,
+Remember to set {field_label}. It is required by {regulation}.,Mundu að setja {field_label}. Það er krafist af {reglugerð}.,
+Enrollment Date cannot be before the Start Date of the Academic Year {0},Innritunardagur getur ekki verið fyrir upphafsdag námsársins {0},
+Enrollment Date cannot be after the End Date of the Academic Term {0},Innritunardagur getur ekki verið eftir lokadag námsársins {0},
+Enrollment Date cannot be before the Start Date of the Academic Term {0},Skráningardagur getur ekki verið fyrir upphafsdag námsársins {0},
+Posting future transactions are not allowed due to Immutable Ledger,Ekki er heimilt að birta færslur í framtíðinni vegna óbreytanlegrar höfuðbókar,
+Future Posting Not Allowed,Framtíðarpóstur ekki leyfður,
+"To enable Capital Work in Progress Accounting, ","Til að virkja bókhald fjármagnsvinnu,",
+you must select Capital Work in Progress Account in accounts table,þú verður að velja Capital Work in Progress Account í reikningstöflu,
+You can also set default CWIP account in Company {},Þú getur einnig stillt sjálfgefinn CWIP reikning í fyrirtæki {},
+The Request for Quotation can be accessed by clicking on the following button,Beiðni um tilboð er hægt að nálgast með því að smella á eftirfarandi hnapp,
+Regards,Kveðja,
+Please click on the following button to set your new password,Vinsamlegast smelltu á eftirfarandi hnapp til að stilla nýja lykilorðið þitt,
+Update Password,Uppfærðu lykilorð,
+Row #{}: Selling rate for item {} is lower than its {}. Selling {} should be atleast {},Röð # {}: Sölugengi hlutar {} er lægra en {} þess. Sala {} ætti að vera að minnsta kosti {},
+You can alternatively disable selling price validation in {} to bypass this validation.,Þú getur einnig slökkt á staðfestingu söluverðs í {} til að fara framhjá þessari löggildingu.,
+Invalid Selling Price,Ógilt söluverð,
+Address needs to be linked to a Company. Please add a row for Company in the Links table.,Heimilisfang þarf að vera tengt fyrirtæki. Vinsamlegast bættu við röð fyrir fyrirtæki í tenglatöflunni.,
+Company Not Linked,Fyrirtæki ekki tengt,
+Import Chart of Accounts from CSV / Excel files,Flytja inn reikningskort úr CSV / Excel skrám,
+Completed Qty cannot be greater than 'Qty to Manufacture',Fullbúið magn getur ekki verið meira en „Magn til framleiðslu“,
+"Row {0}: For Supplier {1}, Email Address is Required to send an email",Röð {0}: Fyrir birgja {1} þarf netfang til að senda tölvupóst,
diff --git a/erpnext/translations/it.csv b/erpnext/translations/it.csv
index 97bf2f1..5dfc2bd 100644
--- a/erpnext/translations/it.csv
+++ b/erpnext/translations/it.csv
@@ -521,7 +521,6 @@
 Chargeble,chargeble,
 Charges are updated in Purchase Receipt against each item,Le tariffe sono aggiornati in acquisto ricevuta contro ogni voce,
 "Charges will be distributed proportionately based on item qty or amount, as per your selection","Spese saranno distribuiti proporzionalmente basate su qty voce o importo, secondo la vostra selezione",
-Chart Of Accounts,Piano dei conti,
 Chart of Cost Centers,Grafico Centro di Costo,
 Check all,Seleziona tutto,
 Checkout,Check-out,
@@ -581,7 +580,6 @@
 Compensatory Off,compensativa Off,
 Compensatory leave request days not in valid holidays,Giorni di congedo compensativo giorni non festivi validi,
 Complaint,Denuncia,
-Completed Qty can not be greater than 'Qty to Manufacture',Completato Quantità non può essere maggiore di 'Quantità di Fabbricazione',
 Completion Date,Data Completamento,
 Computer,Computer,
 Condition,Condizione,
@@ -2033,7 +2031,6 @@
 Please select Charge Type first,Seleziona il tipo di carica prima,
 Please select Company,Selezionare prego,
 Please select Company and Designation,Si prega di selezionare Società e designazione,
-Please select Company and Party Type first,Per favore selezionare prima l'azienda e il tipo di Partner,
 Please select Company and Posting Date to getting entries,Seleziona Società e Data di pubblicazione per ottenere le voci,
 Please select Company first,Seleziona prima azienda,
 Please select Completion Date for Completed Asset Maintenance Log,Selezionare la data di completamento per il registro di manutenzione delle attività completato,
@@ -2980,7 +2977,6 @@
 The name of your company for which you are setting up this system.,Il nome dell'azienda per la quale si sta configurando questo sistema.,
 The number of shares and the share numbers are inconsistent,Il numero di condivisioni e i numeri di condivisione sono incoerenti,
 The payment gateway account in plan {0} is different from the payment gateway account in this payment request,L&#39;account del gateway di pagamento nel piano {0} è diverso dall&#39;account del gateway di pagamento in questa richiesta di pagamento,
-The request for quotation can be accessed by clicking on the following link,Accedere alla richiesta di offerta cliccando sul seguente link,
 The selected BOMs are not for the same item,Le distinte materiali selezionati non sono per la stessa voce,
 The selected item cannot have Batch,La voce selezionata non può avere Batch,
 The seller and the buyer cannot be the same,Il venditore e l&#39;acquirente non possono essere uguali,
@@ -3130,7 +3126,6 @@
 Total flexible benefit component amount {0} should not be less than max benefits {1},L&#39;importo della componente di benefit flessibile totale {0} non deve essere inferiore ai benefit massimi {1},
 Total hours: {0},Ore totali: {0},
 Total leaves allocated is mandatory for Leave Type {0},Le ferie totali assegnate sono obbligatorie per Tipo di uscita {0},
-Total weightage assigned should be 100%. It is {0},Weightage totale assegnato dovrebbe essere al 100% . E ' {0},
 Total working hours should not be greater than max working hours {0},l&#39;orario di lavoro totale non deve essere maggiore di ore di lavoro max {0},
 Total {0} ({1}),Totale {0} ({1}),
 "Total {0} for all items is zero, may be you should change 'Distribute Charges Based On'","Totale {0} per tutti gli elementi è pari a zero, può essere che si dovrebbe cambiare &#39;distribuire oneri corrispondenti&#39;",
@@ -3544,7 +3539,6 @@
 Company field is required,È richiesto il campo dell&#39;azienda,
 Creating Dimensions...,Creazione di quote ...,
 Duplicate entry against the item code {0} and manufacturer {1},Voce duplicata rispetto al codice articolo {0} e al produttore {1},
-Import Chart Of Accounts from CSV / Excel files,Importa piano dei conti da file CSV / Excel,
 Invalid GSTIN! The input you've entered doesn't match the GSTIN format for UIN Holders or Non-Resident OIDAR Service Providers,GSTIN non valido! L&#39;input inserito non corrisponde al formato GSTIN per titolari UIN o provider di servizi OIDAR non residenti,
 Invoice Grand Total,Totale totale fattura,
 Last carbon check date cannot be a future date,La data dell&#39;ultima verifica del carbonio non può essere una data futura,
@@ -3921,7 +3915,6 @@
 Plaid public token error,Errore token pubblico plaid,
 Plaid transactions sync error,Errore di sincronizzazione delle transazioni del plaid,
 Please check the error log for details about the import errors,Controllare il registro degli errori per i dettagli sugli errori di importazione,
-Please click on the following link to set your new password,Cliccate sul link seguente per impostare la nuova password,
 Please create <b>DATEV Settings</b> for Company <b>{}</b>.,Crea le <b>impostazioni DATEV</b> per l&#39;azienda <b>{}</b> .,
 Please create adjustment Journal Entry for amount {0} ,Crea una registrazione prima nota di rettifica per l&#39;importo {0},
 Please do not create more than 500 items at a time,Non creare più di 500 elementi alla volta,
@@ -3997,6 +3990,7 @@
 Release date must be in the future,La data di uscita deve essere in futuro,
 Relieving Date must be greater than or equal to Date of Joining,La data di rilascio deve essere maggiore o uguale alla data di iscrizione,
 Rename,Rinomina,
+Rename Not Allowed,Rinomina non consentita,
 Repayment Method is mandatory for term loans,Il metodo di rimborso è obbligatorio per i prestiti a termine,
 Repayment Start Date is mandatory for term loans,La data di inizio del rimborso è obbligatoria per i prestiti a termine,
 Report Item,Segnala articolo,
@@ -4043,7 +4037,6 @@
 Select All,Seleziona tutto,
 Select Difference Account,Seleziona Conto differenze,
 Select a Default Priority.,Seleziona una priorità predefinita.,
-Select a Supplier from the Default Supplier List of the items below.,Selezionare un fornitore dall&#39;elenco fornitori predefinito degli articoli di seguito.,
 Select a company,Seleziona un&#39;azienda,
 Select finance book for the item {0} at row {1},Seleziona il libro finanziario per l&#39;articolo {0} alla riga {1},
 Select only one Priority as Default.,Seleziona solo una priorità come predefinita.,
@@ -4247,7 +4240,6 @@
 Actual ,Attuale,
 Add to cart,Aggiungi al carrello,
 Budget,Budget,
-Chart Of Accounts Importer,Importatore del piano dei conti,
 Chart of Accounts,Piano dei conti,
 Customer database.,Database clienti.,
 Days Since Last order,Giorni dall'ultimo ordine,
@@ -4546,7 +4538,6 @@
 Check Supplier Invoice Number Uniqueness,Controllare l'unicità del numero fattura fornitore,
 Make Payment via Journal Entry,Effettua il pagamento tramite Registrazione Contabile,
 Unlink Payment on Cancellation of Invoice,Scollegare il pagamento per la cancellazione della fattura,
-Unlink Advance Payment on Cancelation of Order,Scollega pagamento anticipato in caso di annullamento dell&#39;ordine,
 Book Asset Depreciation Entry Automatically,Apprendere automaticamente l&#39;ammortamento dell&#39;attivo,
 Automatically Add Taxes and Charges from Item Tax Template,Aggiungi automaticamente imposte e addebiti dal modello imposta articolo,
 Automatically Fetch Payment Terms,Recupera automaticamente i termini di pagamento,
@@ -4940,7 +4931,6 @@
 POS Customer Group,POS Gruppi clienti,
 POS Field,Campo POS,
 POS Item Group,POS Gruppo Articolo,
-[Select],[Seleziona],
 Company Address,indirizzo aziendale,
 Update Stock,Aggiornare Giacenza,
 Ignore Pricing Rule,Ignora regola tariffaria,
@@ -5706,7 +5696,7 @@
 Lost Quotation,Preventivo Perso,
 Interested,Interessati,
 Converted,Convertito,
-Do Not Contact,Non Contattaci,
+Do Not Contact,Non Contattarci,
 From Customer,Da Cliente,
 Campaign Name,Nome Campagna,
 Follow Up,Seguito,
@@ -6481,7 +6471,6 @@
 Appraisal Template,Modello valutazione,
 For Employee Name,Per Nome Dipendente,
 Goals,Obiettivi,
-Calculate Total Score,Calcola il punteggio totale,
 Total Score (Out of 5),Punteggio totale (i 5),
 "Any other remarks, noteworthy effort that should go in the records.","Eventuali altre osservazioni, sforzo degno di nota che dovrebbe andare nelle registrazioni.",
 Appraisal Goal,Obiettivo di valutazione,
@@ -6599,11 +6588,6 @@
 Reason for Leaving,Motivo per Lasciare,
 Leave Encashed?,Lascia non incassati?,
 Encashment Date,Data Incasso,
-Exit Interview Details,Uscire Dettagli Intervista,
-Held On,Tenutasi il,
-Reason for Resignation,Motivo della Dimissioni,
-Better Prospects,Prospettive Migliori,
-Health Concerns,Preoccupazioni per la salute,
 New Workplace,Nuovo posto di lavoro,
 HR-EAD-.YYYY.-,HR-EAD-.YYYY.-,
 Returned Amount,Importo restituito,
@@ -8239,9 +8223,6 @@
 Manufacturers used in Items,Produttori utilizzati in Articoli,
 Limited to 12 characters,Limitato a 12 caratteri,
 MAT-MR-.YYYY.-,MAT-MR-.YYYY.-,
-Set Warehouse,Imposta magazzino,
-Sets 'For Warehouse' in each row of the Items table.,Imposta &quot;Per magazzino&quot; in ogni riga della tabella Articoli.,
-Requested For,richiesto Per,
 Partially Ordered,Ordinato parzialmente,
 Transferred,trasferito,
 % Ordered,% Ordinato,
@@ -8690,8 +8671,6 @@
 Select warehouse for material requests,Seleziona il magazzino per le richieste di materiale,
 Transfer Materials For Warehouse {0},Trasferisci materiali per magazzino {0},
 Production Plan Material Request Warehouse,Magazzino richiesta materiale piano di produzione,
-Set From Warehouse,Impostato dal magazzino,
-Source Warehouse (Material Transfer),Magazzino di origine (trasferimento di materiale),
 Sets 'Source Warehouse' in each row of the items table.,Imposta &quot;Magazzino di origine&quot; in ogni riga della tabella degli articoli.,
 Sets 'Target Warehouse' in each row of the items table.,Imposta &quot;Magazzino di destinazione&quot; in ogni riga della tabella degli articoli.,
 Show Cancelled Entries,Mostra voci annullate,
@@ -9157,7 +9136,6 @@
 Is Income Tax Component,È una componente dell&#39;imposta sul reddito,
 Component properties and references ,Proprietà e riferimenti dei componenti,
 Additional Salary ,Stipendio aggiuntivo,
-Condtion and formula,Condizione e formula,
 Unmarked days,Giorni non contrassegnati,
 Absent Days,Giorni assenti,
 Conditions and Formula variable and example,Condizioni e variabile di formula ed esempio,
@@ -9444,7 +9422,6 @@
 Please check your Plaid client ID and secret values,Controlla l&#39;ID del tuo cliente Plaid e i valori segreti,
 Bank transaction creation error,Errore di creazione della transazione bancaria,
 Unit of Measurement,Unità di misura,
-Row #{}: Selling rate for item {} is lower than its {}. Selling rate should be atleast {},Riga n. {}: La percentuale di vendita dell&#39;articolo {} è inferiore alla relativa {}. Il tasso di vendita dovrebbe essere di almeno {},
 Fiscal Year {0} Does Not Exist,L&#39;anno fiscale {0} non esiste,
 Row # {0}: Returned Item {1} does not exist in {2} {3},Riga n. {0}: l&#39;articolo restituito {1} non esiste in {2} {3},
 Valuation type charges can not be marked as Inclusive,Gli addebiti del tipo di valutazione non possono essere contrassegnati come inclusivi,
@@ -9598,8 +9575,60 @@
 Response Time for {0} priority in row {1} can't be greater than Resolution Time.,Il tempo di risposta per la {0} priorità nella riga {1} non può essere maggiore del tempo di risoluzione.,
 {0} is not enabled in {1},{0} non è abilitato in {1},
 Group by Material Request,Raggruppa per richiesta materiale,
-"Row {0}: For Supplier {0}, Email Address is Required to Send Email","Riga {0}: per il fornitore {0}, l&#39;indirizzo e-mail è obbligatorio per inviare e-mail",
 Email Sent to Supplier {0},Email inviata al fornitore {0},
 "The Access to Request for Quotation From Portal is Disabled. To Allow Access, Enable it in Portal Settings.","L&#39;accesso alla richiesta di preventivo dal portale è disabilitato. Per consentire l&#39;accesso, abilitalo nelle impostazioni del portale.",
 Supplier Quotation {0} Created,Offerta fornitore {0} creata,
 Valid till Date cannot be before Transaction Date,La data valida fino alla data non può essere precedente alla data della transazione,
+Unlink Advance Payment on Cancellation of Order,Scollegare il pagamento anticipato all&#39;annullamento dell&#39;ordine,
+"Simple Python Expression, Example: territory != 'All Territories'","Espressione Python semplice, esempio: territorio! = &#39;Tutti i territori&#39;",
+Sales Contributions and Incentives,Contributi alle vendite e incentivi,
+Sourced by Supplier,Fornito dal fornitore,
+Total weightage assigned should be 100%.<br>It is {0},Il peso totale assegnato dovrebbe essere del 100%.<br> È {0},
+Account {0} exists in parent company {1}.,L&#39;account {0} esiste nella società madre {1}.,
+"To overrule this, enable '{0}' in company {1}","Per annullare questa impostazione, abilita &quot;{0}&quot; nell&#39;azienda {1}",
+Invalid condition expression,Espressione della condizione non valida,
+Please Select a Company First,Seleziona prima una società,
+Please Select Both Company and Party Type First,Seleziona prima sia la società che il tipo di partito,
+Provide the invoice portion in percent,Fornisci la parte della fattura in percentuale,
+Give number of days according to prior selection,Indicare il numero di giorni in base alla selezione precedente,
+Email Details,Dettagli email,
+"Select a greeting for the receiver. E.g. Mr., Ms., etc.","Seleziona un saluto per il destinatario. Ad esempio, signor, signora, ecc.",
+Preview Email,Anteprima email,
+Please select a Supplier,Seleziona un fornitore,
+Supplier Lead Time (days),Tempo di consegna del fornitore (giorni),
+"Home, Work, etc.","Casa, lavoro, ecc.",
+Exit Interview Held On,Esci Intervista trattenuta,
+Condition and formula,Condizione e formula,
+Sets 'Target Warehouse' in each row of the Items table.,Imposta &quot;Magazzino di destinazione&quot; in ogni riga della tabella Articoli.,
+Sets 'Source Warehouse' in each row of the Items table.,Imposta &quot;Magazzino di origine&quot; in ogni riga della tabella Articoli.,
+POS Register,Registro POS,
+"Can not filter based on POS Profile, if grouped by POS Profile","Impossibile filtrare in base al profilo POS, se raggruppato per profilo POS",
+"Can not filter based on Customer, if grouped by Customer","Non è possibile filtrare in base al cliente, se raggruppato per cliente",
+"Can not filter based on Cashier, if grouped by Cashier","Non è possibile filtrare in base alla Cassa, se raggruppata per Cassa",
+Payment Method,Metodo di pagamento,
+"Can not filter based on Payment Method, if grouped by Payment Method","Non è possibile filtrare in base al metodo di pagamento, se raggruppato per metodo di pagamento",
+Supplier Quotation Comparison,Confronto delle offerte dei fornitori,
+Price per Unit (Stock UOM),Prezzo per unità (Stock UM),
+Group by Supplier,Gruppo per fornitore,
+Group by Item,Raggruppa per articolo,
+Remember to set {field_label}. It is required by {regulation}.,Ricordati di impostare {field_label}. È richiesto dal {regolamento}.,
+Enrollment Date cannot be before the Start Date of the Academic Year {0},La data di iscrizione non può essere antecedente alla data di inizio dell&#39;anno accademico {0},
+Enrollment Date cannot be after the End Date of the Academic Term {0},La data di iscrizione non può essere successiva alla data di fine del periodo accademico {0},
+Enrollment Date cannot be before the Start Date of the Academic Term {0},La data di iscrizione non può essere precedente alla data di inizio del periodo accademico {0},
+Posting future transactions are not allowed due to Immutable Ledger,La registrazione di transazioni future non è consentita a causa di Immutable Ledger,
+Future Posting Not Allowed,Pubblicazione futura non consentita,
+"To enable Capital Work in Progress Accounting, ","Per abilitare la contabilità dei lavori in corso,",
+you must select Capital Work in Progress Account in accounts table,è necessario selezionare Conto lavori in corso nella tabella dei conti,
+You can also set default CWIP account in Company {},Puoi anche impostare un account CWIP predefinito in Azienda {},
+The Request for Quotation can be accessed by clicking on the following button,È possibile accedere alla Richiesta di offerta facendo clic sul pulsante seguente,
+Regards,Saluti,
+Please click on the following button to set your new password,Fare clic sul pulsante seguente per impostare la nuova password,
+Update Password,Aggiorna password,
+Row #{}: Selling rate for item {} is lower than its {}. Selling {} should be atleast {},Riga n. {}: La percentuale di vendita dell&#39;articolo {} è inferiore alla relativa {}. La vendita di {} dovrebbe essere almeno {},
+You can alternatively disable selling price validation in {} to bypass this validation.,"In alternativa, puoi disabilitare la convalida del prezzo di vendita in {} per ignorare questa convalida.",
+Invalid Selling Price,Prezzo di vendita non valido,
+Address needs to be linked to a Company. Please add a row for Company in the Links table.,L&#39;indirizzo deve essere collegato a una società. Aggiungi una riga per Azienda nella tabella Collegamenti.,
+Company Not Linked,Società non collegata,
+Import Chart of Accounts from CSV / Excel files,Importa piano dei conti da file CSV / Excel,
+Completed Qty cannot be greater than 'Qty to Manufacture',La quantità completata non può essere maggiore di &quot;Qtà da produrre&quot;,
+"Row {0}: For Supplier {1}, Email Address is Required to send an email","Riga {0}: per il fornitore {1}, l&#39;indirizzo e-mail è richiesto per inviare un&#39;e-mail",
diff --git a/erpnext/translations/ja.csv b/erpnext/translations/ja.csv
index b2e6b75..9656f5e 100644
--- a/erpnext/translations/ja.csv
+++ b/erpnext/translations/ja.csv
@@ -521,7 +521,6 @@
 Chargeble,有料,
 Charges are updated in Purchase Receipt against each item,料金は、各アイテムに対して、領収書上で更新されます,
 "Charges will be distributed proportionately based on item qty or amount, as per your selection",料金は、選択によって、アイテムの数量または量に基づいて均等に分割されます,
-Chart Of Accounts,勘定科目表,
 Chart of Cost Centers,コストセンターの表,
 Check all,すべてチェック,
 Checkout,チェックアウト,
@@ -581,7 +580,6 @@
 Compensatory Off,代償オフ,
 Compensatory leave request days not in valid holidays,有効休暇ではない補償休暇申請日,
 Complaint,苦情,
-Completed Qty can not be greater than 'Qty to Manufacture',完成した数量は「製造数量」より大きくすることはできません,
 Completion Date,完了日,
 Computer,コンピュータ,
 Condition,条件,
@@ -2033,7 +2031,6 @@
 Please select Charge Type first,請求タイプを最初に選択してください,
 Please select Company,会社を選択してください,
 Please select Company and Designation,会社と指定を選択してください,
-Please select Company and Party Type first,最初の会社と当事者タイプを選択してください,
 Please select Company and Posting Date to getting entries,エントリを取得するには、会社と転記日付を選択してください,
 Please select Company first,会社を選択してください,
 Please select Completion Date for Completed Asset Maintenance Log,完了した資産管理ログの完了日を選択してください,
@@ -2980,7 +2977,6 @@
 The name of your company for which you are setting up this system.,このシステムを設定する会社の名前,
 The number of shares and the share numbers are inconsistent,株式数と株式数が矛盾している,
 The payment gateway account in plan {0} is different from the payment gateway account in this payment request,プラン{0}の支払ゲートウェイ口座が、この支払依頼の支払ゲートウェイ口座と異なる,
-The request for quotation can be accessed by clicking on the following link,見積依頼は、以下のリンクをクリックすることによってアクセスすることができます,
 The selected BOMs are not for the same item,選択されたBOMはアイテムと同一ではありません,
 The selected item cannot have Batch,選択した項目はバッチを持てません,
 The seller and the buyer cannot be the same,売り手と買い手は同じではありません,
@@ -3130,7 +3126,6 @@
 Total flexible benefit component amount {0} should not be less than max benefits {1},フレキシブル給付金の総額{0}は、最大給付額{1}より少なくてはいけません,
 Total hours: {0},合計時間：{0},
 Total leaves allocated is mandatory for Leave Type {0},割り当てられたリーフの種類は{0},
-Total weightage assigned should be 100%. It is {0},割り当てられた重みづけの合計は100％でなければなりません。{0}になっています。,
 Total working hours should not be greater than max working hours {0},総労働時間は最大労働時間よりも大きくてはいけません{0},
 Total {0} ({1}),合計{0}（{1}）,
 "Total {0} for all items is zero, may be you should change 'Distribute Charges Based On'",合計{0}のすべての項目がゼロになっています。「支払案分基準」を変更する必要があるかもしれません,
@@ -3544,7 +3539,6 @@
 Company field is required,会社フィールドは必須です,
 Creating Dimensions...,ディメンションを作成しています...,
 Duplicate entry against the item code {0} and manufacturer {1},商品コード{0}と製造元{1}に対する重複エントリ,
-Import Chart Of Accounts from CSV / Excel files,CSV / Excelファイルから勘定科目表のインポート,
 Invalid GSTIN! The input you've entered doesn't match the GSTIN format for UIN Holders or Non-Resident OIDAR Service Providers,GSTINが無効です。入力した入力が、UIN保有者または非居住者用OIDARサービスプロバイダのGSTIN形式と一致しません,
 Invoice Grand Total,請求書の合計,
 Last carbon check date cannot be a future date,最後のカーボンチェック日を未来の日にすることはできません,
@@ -3921,7 +3915,6 @@
 Plaid public token error,プレイドパブリックトークンエラー,
 Plaid transactions sync error,格子縞のトランザクション同期エラー,
 Please check the error log for details about the import errors,インポートエラーの詳細についてはエラーログを確認してください。,
-Please click on the following link to set your new password,新しいパスワードを設定するには、次のリンクをクリックしてください,
 Please create <b>DATEV Settings</b> for Company <b>{}</b>.,会社<b>{}の</b> <b>DATEV設定</b>を作成してください。,
 Please create adjustment Journal Entry for amount {0} ,金額{0}の調整仕訳を作成してください,
 Please do not create more than 500 items at a time,一度に500個を超えるアイテムを作成しないでください,
@@ -3997,6 +3990,7 @@
 Release date must be in the future,発売日は未来でなければなりません,
 Relieving Date must be greater than or equal to Date of Joining,免除日は参加日以上でなければなりません,
 Rename,名称変更,
+Rename Not Allowed,許可されていない名前の変更,
 Repayment Method is mandatory for term loans,タームローンには返済方法が必須,
 Repayment Start Date is mandatory for term loans,定期ローンの返済開始日は必須です,
 Report Item,レポートアイテム,
@@ -4043,7 +4037,6 @@
 Select All,すべて選択,
 Select Difference Account,差額勘定を選択,
 Select a Default Priority.,デフォルトの優先順位を選択します。,
-Select a Supplier from the Default Supplier List of the items below.,以下のアイテムのデフォルトのサプライヤーリストからサプライヤーを選択します。,
 Select a company,会社を選択,
 Select finance book for the item {0} at row {1},行{1}のアイテム{0}のファイナンスブックを選択してください,
 Select only one Priority as Default.,デフォルトとして優先度を1つだけ選択します。,
@@ -4247,7 +4240,6 @@
 Actual ,実際,
 Add to cart,カートに追加,
 Budget,予算,
-Chart Of Accounts Importer,アカウントインポーターのチャート,
 Chart of Accounts,勘定科目一覧表,
 Customer database.,顧客データベース,
 Days Since Last order,最新注文からの日数,
@@ -4546,7 +4538,6 @@
 Check Supplier Invoice Number Uniqueness,サプライヤー請求番号が一意であることを確認,
 Make Payment via Journal Entry,仕訳を経由して支払いを行います,
 Unlink Payment on Cancellation of Invoice,請求書のキャンセルにお支払いのリンクを解除,
-Unlink Advance Payment on Cancelation of Order,注文のキャンセルに関する前払いのリンクの解除,
 Book Asset Depreciation Entry Automatically,資産償却エントリを自動的に記帳,
 Automatically Add Taxes and Charges from Item Tax Template,アイテム税テンプレートから自動的に税金と請求を追加,
 Automatically Fetch Payment Terms,支払い条件を自動的に取得する,
@@ -4940,7 +4931,6 @@
 POS Customer Group,POSの顧客グループ,
 POS Field,POSフィールド,
 POS Item Group,POSアイテムのグループ,
-[Select],[選択],
 Company Address,会社住所,
 Update Stock,在庫更新,
 Ignore Pricing Rule,価格設定ルールを無視,
@@ -6481,7 +6471,6 @@
 Appraisal Template,査定テンプレート,
 For Employee Name,従業員名用,
 Goals,ゴール,
-Calculate Total Score,合計スコアを計算,
 Total Score (Out of 5),総得点（5点満点）,
 "Any other remarks, noteworthy effort that should go in the records.",記録内で注目に値する特記事項,
 Appraisal Goal,査定目標,
@@ -6599,11 +6588,6 @@
 Reason for Leaving,退職理由,
 Leave Encashed?,現金化された休暇？,
 Encashment Date,現金化日,
-Exit Interview Details,インタビュー詳細を終了,
-Held On,開催,
-Reason for Resignation,退職理由,
-Better Prospects,良い見通し,
-Health Concerns,健康への懸念,
 New Workplace,新しい職場,
 HR-EAD-.YYYY.-,HR-EAD-.YYYY.-,
 Returned Amount,返金額,
@@ -8239,9 +8223,6 @@
 Manufacturers used in Items,アイテムに使用されるメーカー,
 Limited to 12 characters,12文字に制限されています,
 MAT-MR-.YYYY.-,MAT-MR- .YYYY.-,
-Set Warehouse,倉庫を設定する,
-Sets 'For Warehouse' in each row of the Items table.,Itemsテーブルの各行に「ForWarehouse」を設定します。,
-Requested For,要求対象,
 Partially Ordered,半順序,
 Transferred,転送された,
 % Ordered,％注文済,
@@ -8690,8 +8671,6 @@
 Select warehouse for material requests,資材依頼用の倉庫を選択,
 Transfer Materials For Warehouse {0},倉庫{0}の転送資材,
 Production Plan Material Request Warehouse,生産計画資材依頼倉庫,
-Set From Warehouse,倉庫から設定,
-Source Warehouse (Material Transfer),ソースウェアハウス（資材転送）,
 Sets 'Source Warehouse' in each row of the items table.,itemsテーブルの各行に「SourceWarehouse」を設定します。,
 Sets 'Target Warehouse' in each row of the items table.,itemsテーブルの各行に「TargetWarehouse」を設定します。,
 Show Cancelled Entries,キャンセルされたエントリを表示する,
@@ -9157,7 +9136,6 @@
 Is Income Tax Component,所得税の要素ですか,
 Component properties and references ,コンポーネントのプロパティと参照,
 Additional Salary ,追加給与,
-Condtion and formula,条件と式,
 Unmarked days,マークされていない日,
 Absent Days,不在日,
 Conditions and Formula variable and example,条件と式の変数と例,
@@ -9444,7 +9422,6 @@
 Please check your Plaid client ID and secret values,チェック柄のクライアントIDとシークレット値を確認してください,
 Bank transaction creation error,銀行取引作成エラー,
 Unit of Measurement,測定の単位,
-Row #{}: Selling rate for item {} is lower than its {}. Selling rate should be atleast {},行＃{}：アイテム{}の販売率はその{}よりも低くなっています。販売率は少なくとも{}でなければなりません,
 Fiscal Year {0} Does Not Exist,会計年度{0}は存在しません,
 Row # {0}: Returned Item {1} does not exist in {2} {3},行番号{0}：返品されたアイテム{1}は{2} {3}に存在しません,
 Valuation type charges can not be marked as Inclusive,評価タイプの料金を包括的としてマークすることはできません,
@@ -9598,8 +9575,60 @@
 Response Time for {0} priority in row {1} can't be greater than Resolution Time.,行{1}の{0}優先度の応答時間は解決時間より長くすることはできません。,
 {0} is not enabled in {1},{0}は{1}で有効になっていません,
 Group by Material Request,マテリアルリクエストによるグループ化,
-"Row {0}: For Supplier {0}, Email Address is Required to Send Email",行{0}：サプライヤー{0}の場合、Eメールを送信するにはEメールアドレスが必要です,
 Email Sent to Supplier {0},サプライヤーに送信された電子メール{0},
 "The Access to Request for Quotation From Portal is Disabled. To Allow Access, Enable it in Portal Settings.",ポータルからの見積依頼へのアクセスが無効になっています。アクセスを許可するには、ポータル設定で有効にします。,
 Supplier Quotation {0} Created,サプライヤー見積もり{0}が作成されました,
 Valid till Date cannot be before Transaction Date,有効期限は取引日より前にすることはできません,
+Unlink Advance Payment on Cancellation of Order,注文のキャンセル時に前払いのリンクを解除する,
+"Simple Python Expression, Example: territory != 'All Territories'",単純なPython式、例：territory！= &#39;すべてのテリトリー&#39;,
+Sales Contributions and Incentives,売上への貢献とインセンティブ,
+Sourced by Supplier,サプライヤーによる供給,
+Total weightage assigned should be 100%.<br>It is {0},割り当てられる総重みは100％である必要があります。<br> {0}です,
+Account {0} exists in parent company {1}.,アカウント{0}は親会社{1}に存在します。,
+"To overrule this, enable '{0}' in company {1}",これを無効にするには、会社{1}で「{0}」を有効にします,
+Invalid condition expression,無効な条件式,
+Please Select a Company First,最初に会社を選択してください,
+Please Select Both Company and Party Type First,最初に会社とパーティーの両方のタイプを選択してください,
+Provide the invoice portion in percent,請求書の部分をパーセントで入力します,
+Give number of days according to prior selection,事前の選択に従って日数を与える,
+Email Details,メールの詳細,
+"Select a greeting for the receiver. E.g. Mr., Ms., etc.",受信者の挨拶を選択します。例：Mr.、Ms。など,
+Preview Email,プレビューメール,
+Please select a Supplier,サプライヤーを選択してください,
+Supplier Lead Time (days),サプライヤーのリードタイム（日）,
+"Home, Work, etc.",自宅、職場など,
+Exit Interview Held On,面接終了,
+Condition and formula,条件と式,
+Sets 'Target Warehouse' in each row of the Items table.,Itemsテーブルの各行に「TargetWarehouse」を設定します。,
+Sets 'Source Warehouse' in each row of the Items table.,Itemsテーブルの各行に「SourceWarehouse」を設定します。,
+POS Register,POSレジスタ,
+"Can not filter based on POS Profile, if grouped by POS Profile",POSプロファイルでグループ化されている場合、POSプロファイルに基づいてフィルタリングすることはできません,
+"Can not filter based on Customer, if grouped by Customer",顧客ごとにグループ化されている場合、顧客に基づいてフィルタリングすることはできません,
+"Can not filter based on Cashier, if grouped by Cashier",キャッシャーでグループ化されている場合、キャッシャーに基づいてフィルタリングすることはできません,
+Payment Method,支払方法,
+"Can not filter based on Payment Method, if grouped by Payment Method",支払い方法でグループ化されている場合、支払い方法に基づいてフィルタリングすることはできません,
+Supplier Quotation Comparison,サプライヤーの見積もりの比較,
+Price per Unit (Stock UOM),ユニットあたりの価格（ストック単位）,
+Group by Supplier,サプライヤー別グループ,
+Group by Item,アイテムでグループ化,
+Remember to set {field_label}. It is required by {regulation}.,{field_label}を設定することを忘れないでください。 {規制}で義務付けられています。,
+Enrollment Date cannot be before the Start Date of the Academic Year {0},登録日は、学年度の開始日より前にすることはできません{0},
+Enrollment Date cannot be after the End Date of the Academic Term {0},登録日は、学期の終了日より後にすることはできません{0},
+Enrollment Date cannot be before the Start Date of the Academic Term {0},登録日は、学期の開始日より前にすることはできません{0},
+Posting future transactions are not allowed due to Immutable Ledger,不変元帳のため、将来の取引の転記は許可されていません,
+Future Posting Not Allowed,今後の投稿は許可されません,
+"To enable Capital Work in Progress Accounting, ",資本仕掛品会計を有効にするには、,
+you must select Capital Work in Progress Account in accounts table,勘定科目テーブルで資本仕掛品勘定科目を選択する必要があります,
+You can also set default CWIP account in Company {},会社{}でデフォルトのCWIPアカウントを設定することもできます,
+The Request for Quotation can be accessed by clicking on the following button,見積依頼には、次のボタンをクリックしてアクセスできます。,
+Regards,よろしく,
+Please click on the following button to set your new password,次のボタンをクリックして、新しいパスワードを設定してください,
+Update Password,パスワードの更新,
+Row #{}: Selling rate for item {} is lower than its {}. Selling {} should be atleast {},行＃{}：アイテム{}の販売率はその{}よりも低くなっています。 {}の販売は少なくとも{}である必要があります,
+You can alternatively disable selling price validation in {} to bypass this validation.,または、{}で販売価格の検証を無効にして、この検証をバイパスすることもできます。,
+Invalid Selling Price,無効な販売価格,
+Address needs to be linked to a Company. Please add a row for Company in the Links table.,住所は会社にリンクする必要があります。リンクテーブルに会社の行を追加してください。,
+Company Not Linked,リンクされていない会社,
+Import Chart of Accounts from CSV / Excel files,CSV / Excelファイルから勘定科目表をインポートする,
+Completed Qty cannot be greater than 'Qty to Manufacture',完了数量は「製造数量」を超えることはできません,
+"Row {0}: For Supplier {1}, Email Address is Required to send an email",行{0}：サプライヤー{1}の場合、Eメールを送信するにはEメールアドレスが必要です,
diff --git a/erpnext/translations/km.csv b/erpnext/translations/km.csv
index d08acb3..12abed6 100644
--- a/erpnext/translations/km.csv
+++ b/erpnext/translations/km.csv
@@ -521,7 +521,6 @@
 Chargeble,អាចសាកបាន។,
 Charges are updated in Purchase Receipt against each item,ការចោទប្រកាន់ត្រូវបានធ្វើបច្ចុប្បន្នភាពនៅបង្កាន់ដៃទិញប្រឆាំងនឹងធាតុគ្នា,
 "Charges will be distributed proportionately based on item qty or amount, as per your selection",បទចោទប្រកាន់នឹងត្រូវបានចែកដោយផ្អែកលើធាតុ qty សមាមាត្រឬបរិមាណជាមួយជម្រើសរបស់អ្នក,
-Chart Of Accounts,គំនូសតាងគណនី,
 Chart of Cost Centers,គំនូសតាងនៃមជ្ឈមណ្ឌលការចំណាយ,
 Check all,សូមពិនិត្យមើលទាំងអស់,
 Checkout,ពិនិត្យមុនពេលចេញ,
@@ -581,7 +580,6 @@
 Compensatory Off,ទូទាត់បិទ,
 Compensatory leave request days not in valid holidays,ថ្ងៃស្នើសុំការឈប់សម្រាកមិនមានថ្ងៃឈប់សម្រាកត្រឹមត្រូវ,
 Complaint,បណ្តឹង,
-Completed Qty can not be greater than 'Qty to Manufacture',Qty បានបញ្ចប់មិនអាចជាធំជាង Qty ដើម្បីផលិត &quot;,
 Completion Date,កាលបរិច្ឆេទបញ្ចប់,
 Computer,កុំព្យូទ័រ,
 Condition,លក្ខខណ្ឌ,
@@ -2033,7 +2031,6 @@
 Please select Charge Type first,សូមជ្រើសប្រភេទទទួលបន្ទុកជាលើកដំបូង,
 Please select Company,សូមជ្រើសរើសក្រុមហ៊ុន,
 Please select Company and Designation,សូមជ្រើសរើសក្រុមហ៊ុននិងការកំណត់,
-Please select Company and Party Type first,សូមជ្រើសប្រភេទក្រុមហ៊ុននិងបក្សទីមួយ,
 Please select Company and Posting Date to getting entries,សូមជ្រើសរើសក្រុមហ៊ុននិងកាលបរិច្ឆេទប្រកាសដើម្បីទទួលបានធាតុ,
 Please select Company first,សូមជ្រើសរើសក្រុមហ៊ុនដំបូង,
 Please select Completion Date for Completed Asset Maintenance Log,សូមជ្រើសកាលបរិច្ឆេទបញ្ចប់សម្រាប់កំណត់ហេតុថែរក្សាទ្រព្យសម្បត្តិរួចរាល់,
@@ -2980,7 +2977,6 @@
 The name of your company for which you are setting up this system.,ឈ្មោះរបស់ក្រុមហ៊ុនរបស់អ្នកដែលអ្នកកំពុងបង្កើតប្រព័ន្ធនេះ។,
 The number of shares and the share numbers are inconsistent,ចំនួនភាគហ៊ុននិងលេខភាគហ៊ុនមិនសមស្រប,
 The payment gateway account in plan {0} is different from the payment gateway account in this payment request,គណនីច្រកទូទាត់នៅក្នុងគម្រោង {0} គឺខុសពីគណនីទូទាត់ប្រាក់នៅក្នុងការបង់ប្រាក់នេះ,
-The request for quotation can be accessed by clicking on the following link,សំណើរសម្រាប់សម្រង់នេះអាចត្រូវបានចូលដំណើរការដោយចុចលើតំណខាងក្រោម,
 The selected BOMs are not for the same item,នេះ BOMs បានជ្រើសរើសគឺមិនមែនសម្រាប់ធាតុដូចគ្នា,
 The selected item cannot have Batch,ធាតុដែលបានជ្រើសមិនអាចមានជំនាន់ទី,
 The seller and the buyer cannot be the same,អ្នកលក់និងអ្នកទិញមិនអាចមានលក្ខណៈដូចគ្នាទេ,
@@ -3130,7 +3126,6 @@
 Total flexible benefit component amount {0} should not be less than max benefits {1},ចំនួនសរុបនៃផលប្រយោជន៏ដែលអាចបត់បែនបាន {0} មិនគួរតិចជាងអត្ថប្រយោជន៍ច្រើនបំផុត {1},
 Total hours: {0},ម៉ោងសរុប: {0},
 Total leaves allocated is mandatory for Leave Type {0},ចំនួនស្លឹកដែលបានបម្រុងទុកគឺចាំបាច់សម្រាប់ការចាកចេញពីប្រភេទ {0},
-Total weightage assigned should be 100%. It is {0},weightage សរុបដែលបានផ្ដល់គួរតែទទួលបាន 100% ។ វាគឺជា {0},
 Total working hours should not be greater than max working hours {0},ម៉ោងធ្វើការសរុបមិនគួរត្រូវបានធំជាងម៉ោងធ្វើការអតិបរមា {0},
 Total {0} ({1}),សរុប {0} ({1}),
 "Total {0} for all items is zero, may be you should change 'Distribute Charges Based On'","សរុប {0} សម្រាប់ធាតុទាំងអស់គឺសូន្យ, អាចជាអ្នកគួរផ្លាស់ប្តូរ &quot;ចែកបទចោទប្រកាន់ដោយផ្អែកលើ",
@@ -3544,7 +3539,6 @@
 Company field is required,វាលក្រុមហ៊ុនត្រូវបានទាមទារ។,
 Creating Dimensions...,កំពុងបង្កើតវិមាត្រ ...,
 Duplicate entry against the item code {0} and manufacturer {1},ស្ទួនធាតុប្រឆាំងនឹងកូដធាតុ {0} និងក្រុមហ៊ុនផលិត {1},
-Import Chart Of Accounts from CSV / Excel files,នាំចូលតារាងតម្លៃគណនីពីឯកសារស៊ីអេសអេស / អេហ្វអេស។,
 Invalid GSTIN! The input you've entered doesn't match the GSTIN format for UIN Holders or Non-Resident OIDAR Service Providers,GSTIN មិនត្រឹមត្រូវ! ការបញ្ចូលដែលអ្នកបានបញ្ចូលមិនត្រូវគ្នានឹងទំរង់ GSTIN សំរាប់អ្នកកាន់ UIN រឺអ្នកផ្តល់សេវាកម្ម OIDAR មិនមែនអ្នកស្នាក់នៅ។,
 Invoice Grand Total,វិក្ក័យបត្រសរុប។,
 Last carbon check date cannot be a future date,កាលបរិច្ឆេទពិនិត្យកាបូនចុងក្រោយមិនអាចជាកាលបរិច្ឆេទនាពេលអនាគតទេ។,
@@ -3921,7 +3915,6 @@
 Plaid public token error,កំហុសនិមិត្តសញ្ញាសាធារណៈរបស់ Plaid ។,
 Plaid transactions sync error,កំហុសក្នុងការធ្វើសមកាលកម្មប្រតិបត្តិការ Plaid ។,
 Please check the error log for details about the import errors,សូមពិនិត្យកំណត់ហេតុកំហុសសម្រាប់ព័ត៌មានលម្អិតអំពីកំហុសនាំចូល។,
-Please click on the following link to set your new password,សូមចុចលើតំណខាងក្រោមដើម្បីកំណត់ពាក្យសម្ងាត់ថ្មីរបស់អ្នក,
 Please create <b>DATEV Settings</b> for Company <b>{}</b>.,សូមបង្កើត <b>ការកំណត់ DATEV</b> សម្រាប់ក្រុមហ៊ុន <b>{}</b> ។,
 Please create adjustment Journal Entry for amount {0} ,សូមបង្កើតការកែសម្រួលទិនានុប្បវត្តិធាតុសម្រាប់ចំនួន {0},
 Please do not create more than 500 items at a time,សូមកុំបង្កើតរបស់របរច្រើនជាង ៥០០ ក្នុងពេលតែមួយ។,
@@ -3997,6 +3990,7 @@
 Release date must be in the future,កាលបរិច្ឆេទនៃការចេញផ្សាយត្រូវតែមាននាពេលអនាគត។,
 Relieving Date must be greater than or equal to Date of Joining,កាលបរិច្ឆេទដែលទុកចិត្តត្រូវតែធំជាងឬស្មើកាលបរិច្ឆេទនៃការចូលរួម,
 Rename,ប្តូរឈ្មោះ,
+Rename Not Allowed,មិនប្តូរឈ្មោះមិនអនុញ្ញាត។,
 Repayment Method is mandatory for term loans,វិធីសាស្រ្តទូទាត់សងគឺចាំបាច់សម្រាប់ប្រាក់កម្ចីរយៈពេល,
 Repayment Start Date is mandatory for term loans,កាលបរិច្ឆេទចាប់ផ្តើមសងគឺចាំបាច់សម្រាប់ប្រាក់កម្ចីមានកាលកំណត់,
 Report Item,រាយការណ៍អំពីធាតុ។,
@@ -4043,7 +4037,6 @@
 Select All,ជ្រើសទាំងអស់,
 Select Difference Account,ជ្រើសរើសគណនីខុសគ្នា។,
 Select a Default Priority.,ជ្រើសអាទិភាពលំនាំដើម។,
-Select a Supplier from the Default Supplier List of the items below.,ជ្រើសរើសអ្នកផ្គត់ផ្គង់ពីបញ្ជីអ្នកផ្គត់ផ្គង់លំនាំដើមនៃធាតុខាងក្រោម។,
 Select a company,ជ្រើសរើសក្រុមហ៊ុន។,
 Select finance book for the item {0} at row {1},ជ្រើសរើសសៀវភៅហិរញ្ញវត្ថុសម្រាប់ធាតុ {០} នៅជួរ {១},
 Select only one Priority as Default.,ជ្រើសអាទិភាពមួយជាលំនាំដើម។,
@@ -4247,7 +4240,6 @@
 Actual ,ពិតប្រាកដ,
 Add to cart,បញ្ចូលទៅក្នុងរទេះ,
 Budget,ថវិការ,
-Chart Of Accounts Importer,តារាងនាំចូលគណនី។,
 Chart of Accounts,តារាងគណនី,
 Customer database.,មូលដ្ឋានទិន្នន័យអតិថិជន។,
 Days Since Last order,ថ្ងៃចាប់ពីលំដាប់ចុងក្រោយ,
@@ -4546,7 +4538,6 @@
 Check Supplier Invoice Number Uniqueness,ពិនិត្យហាងទំនិញវិក័យប័ត្រលេខពិសេស,
 Make Payment via Journal Entry,ធ្វើឱ្យសេវាទូទាត់តាមរយៈ Journal Entry,
 Unlink Payment on Cancellation of Invoice,ដោះតំណទូទាត់វិក័យប័ត្រនៅលើការលុបចោល,
-Unlink Advance Payment on Cancelation of Order,ដកការបង់ប្រាក់ជាមុនលើការលុបចោលការបញ្ជាទិញ។,
 Book Asset Depreciation Entry Automatically,សៀវភៅរំលស់ទ្រព្យសម្បត្តិចូលដោយស្វ័យប្រវត្តិ,
 Automatically Add Taxes and Charges from Item Tax Template,បន្ថែមពន្ធនិងការគិតថ្លៃដោយស្វ័យប្រវត្តិពីគំរូពន្ធលើទំនិញ។,
 Automatically Fetch Payment Terms,ប្រមូលយកលក្ខខណ្ឌទូទាត់ដោយស្វ័យប្រវត្តិ។,
@@ -4940,7 +4931,6 @@
 POS Customer Group,ក្រុមផ្ទាល់ខ្លួនម៉ាស៊ីនឆូតកាត,
 POS Field,វាលម៉ាស៊ីនឆូតកាត,
 POS Item Group,គ្រុបធាតុម៉ាស៊ីនឆូតកាត,
-[Select],[ជ្រើសរើស],
 Company Address,អាសយដ្ឋានរបស់ក្រុមហ៊ុន,
 Update Stock,ធ្វើឱ្យទាន់សម័យហ៊ុន,
 Ignore Pricing Rule,មិនអើពើវិធានតម្លៃ,
@@ -6481,7 +6471,6 @@
 Appraisal Template,ការវាយតម្លៃទំព័រគំរូ,
 For Employee Name,សម្រាប់ឈ្មោះបុគ្គលិក,
 Goals,គ្រាប់បាល់បញ្ចូលទី,
-Calculate Total Score,គណនាពិន្ទុសរុប,
 Total Score (Out of 5),ពិន្ទុសរុប (ក្នុងចំណោម 5),
 "Any other remarks, noteworthy effort that should go in the records.","ការកត់សម្គាល់ណាមួយផ្សេងទៀត, ការខិតខំប្រឹងប្រែងគួរឱ្យកត់សម្គាល់ដែលគួរតែចូលទៅក្នុងរបាយការណ៍។",
 Appraisal Goal,គោលដៅវាយតម្លៃ,
@@ -6599,11 +6588,6 @@
 Reason for Leaving,ហេតុផលសម្រាប់ការចាកចេញ,
 Leave Encashed?,ទុកឱ្យ Encashed?,
 Encashment Date,Encashment កាលបរិច្ឆេទ,
-Exit Interview Details,ពត៌មានលំអិតចេញពីការសម្ភាសន៍,
-Held On,ប្រារព្ធឡើងនៅថ្ងៃទី,
-Reason for Resignation,ហេតុផលសម្រាប់ការលាលែងពីតំណែង,
-Better Prospects,ទស្សនវិស័យល្អប្រសើរជាងមុន,
-Health Concerns,ការព្រួយបារម្ភសុខភាព,
 New Workplace,ញូការងារ,
 HR-EAD-.YYYY.-,HR-EAD -YYYY.-,
 Returned Amount,ចំនួនទឹកប្រាក់ត្រឡប់មកវិញ,
@@ -8239,9 +8223,6 @@
 Manufacturers used in Items,ក្រុមហ៊ុនផលិតដែលត្រូវបានប្រើនៅក្នុងធាតុ,
 Limited to 12 characters,កំណត់ទៅជា 12 តួអក្សរ,
 MAT-MR-.YYYY.-,MAT-MR-YYYY.-,
-Set Warehouse,កំណត់ឃ្លាំង,
-Sets 'For Warehouse' in each row of the Items table.,កំណត់ &#39;សម្រាប់ឃ្លាំង&#39; នៅក្នុងជួរនីមួយៗនៃតារាងធាតុ។,
-Requested For,ស្នើសម្រាប់,
 Partially Ordered,បានបញ្ជាទិញដោយផ្នែក,
 Transferred,ផ្ទេរ,
 % Ordered,% បានបញ្ជា(ទិញឬលក់),
@@ -8690,8 +8671,6 @@
 Select warehouse for material requests,ជ្រើសរើសឃ្លាំងសម្រាប់ការស្នើសុំសម្ភារៈ,
 Transfer Materials For Warehouse {0},ផ្ទេរសម្ភារៈសម្រាប់ឃ្លាំង {0},
 Production Plan Material Request Warehouse,សម្ភារៈស្នើសុំផែនការផលិតកម្មឃ្លាំង,
-Set From Warehouse,កំណត់ពីឃ្លាំង,
-Source Warehouse (Material Transfer),ឃ្លាំងប្រភព (ផ្ទេរសម្ភារៈ),
 Sets 'Source Warehouse' in each row of the items table.,កំណត់ &#39;ឃ្លាំងប្រភព&#39; នៅក្នុងជួរនីមួយៗនៃតារាងធាតុ។,
 Sets 'Target Warehouse' in each row of the items table.,កំណត់ &#39;ឃ្លាំងគោលដៅ&#39; នៅក្នុងជួរនីមួយៗនៃតារាងធាតុ។,
 Show Cancelled Entries,បង្ហាញធាតុដែលបានបោះបង់,
@@ -9157,7 +9136,6 @@
 Is Income Tax Component,គឺជាសមាសធាតុពន្ធលើប្រាក់ចំណូល,
 Component properties and references ,លក្ខណៈសម្បត្តិនិងឯកសារយោង,
 Additional Salary ,ប្រាក់ខែបន្ថែម,
-Condtion and formula,លក្ខខណ្ឌនិងរូបមន្ត,
 Unmarked days,ថ្ងៃដែលមិនបានសម្គាល់,
 Absent Days,ថ្ងៃអវត្តមាន,
 Conditions and Formula variable and example,លក្ខខណ្ឌនិងអថេររូបមន្តនិងឧទាហរណ៍,
@@ -9444,7 +9422,6 @@
 Please check your Plaid client ID and secret values,សូមពិនិត្យលេខសម្គាល់អតិថិជន Plaid និងតម្លៃសំងាត់,
 Bank transaction creation error,កំហុសក្នុងការបង្កើតប្រតិបត្តិការធនាគារ,
 Unit of Measurement,ឯកតារង្វាស់,
-Row #{}: Selling rate for item {} is lower than its {}. Selling rate should be atleast {},ជួរដេក # {}៖ អត្រាលក់របស់ធាតុ {} ទាបជាង {} របស់វា។ អត្រាលក់គួរតែមានភាពអន់បំផុត {},
 Fiscal Year {0} Does Not Exist,ឆ្នាំសារពើពន្ធ {០} មិនមានទេ,
 Row # {0}: Returned Item {1} does not exist in {2} {3},ជួរដេក # {០}៖ ធាតុដែលបានត្រឡប់ {១} មិនមាននៅក្នុង {២} {៣},
 Valuation type charges can not be marked as Inclusive,ការចោទប្រកាន់ប្រភេទតម្លៃមិនអាចត្រូវបានសម្គាល់ថារាប់បញ្ចូលនោះទេ,
@@ -9598,8 +9575,60 @@
 Response Time for {0} priority in row {1} can't be greater than Resolution Time.,ពេលវេលាឆ្លើយតបសម្រាប់ {0} អាទិភាពក្នុងជួរដេក {1} មិនអាចធំជាងពេលវេលាដោះស្រាយបានទេ។,
 {0} is not enabled in {1},{0} មិនត្រូវបានបើកនៅក្នុង {1},
 Group by Material Request,ដាក់ជាក្រុមតាមសំណើសម្ភារៈ,
-"Row {0}: For Supplier {0}, Email Address is Required to Send Email",ជួរដេក {0}៖ សម្រាប់អ្នកផ្គត់ផ្គង់ {0} អាស័យដ្ឋានអ៊ីម៉ែលគឺត្រូវការផ្ញើអ៊ីមែល,
 Email Sent to Supplier {0},អ៊ីមែលបានផ្ញើទៅអ្នកផ្គត់ផ្គង់ {0},
 "The Access to Request for Quotation From Portal is Disabled. To Allow Access, Enable it in Portal Settings.",សិទ្ធិទទួលបានការស្នើសុំដកស្រង់ពីវិបផតថលត្រូវបានបិទ។ ដើម្បីអនុញ្ញាតការចូលប្រើបើកវានៅក្នុងការកំណត់វិបផតថល។,
 Supplier Quotation {0} Created,សម្រង់អ្នកផ្គត់ផ្គង់ {០} បង្កើត,
 Valid till Date cannot be before Transaction Date,សុពលភាពរហូតដល់កាលបរិច្ឆេទមិនអាចមុនកាលបរិច្ឆេទប្រតិបត្តិការ,
+Unlink Advance Payment on Cancellation of Order,ដកការបង់ប្រាក់ជាមុនលើការលុបចោលការបញ្ជាទិញ,
+"Simple Python Expression, Example: territory != 'All Territories'",កន្សោមពស់ថ្លាន់សាមញ្ញឧទាហរណ៍៖ ទឹកដី! = &#39;ដែនដីទាំងអស់&#39;,
+Sales Contributions and Incentives,វិភាគទានការលក់និងការលើកទឹកចិត្ត,
+Sourced by Supplier,ប្រភពដោយអ្នកផ្គត់ផ្គង់,
+Total weightage assigned should be 100%.<br>It is {0},ទំងន់សរុបដែលបានកំណត់គួរមាន 100% ។<br> វាគឺ {0},
+Account {0} exists in parent company {1}.,គណនី {0} មាននៅក្នុងក្រុមហ៊ុនមេ {1} ។,
+"To overrule this, enable '{0}' in company {1}",ដើម្បីបដិសេធរឿងនេះបើកដំណើរការ &#39;{0}&#39; នៅក្នុងក្រុមហ៊ុន {1},
+Invalid condition expression,ការបង្ហាញលក្ខខណ្ឌមិនត្រឹមត្រូវ,
+Please Select a Company First,សូមជ្រើសរើសក្រុមហ៊ុនជាមុនសិន,
+Please Select Both Company and Party Type First,សូមជ្រើសរើសទាំងក្រុមហ៊ុននិងប្រភេទគណបក្សជាមុនសិន,
+Provide the invoice portion in percent,ផ្តល់ចំណែកវិក័យប័ត្រគិតជាភាគរយ,
+Give number of days according to prior selection,ផ្តល់ចំនួនថ្ងៃយោងទៅតាមការជ្រើសរើសមុន,
+Email Details,ព័ត៌មានលម្អិតអ៊ីមែល,
+"Select a greeting for the receiver. E.g. Mr., Ms., etc.","ជ្រើសរើសការស្វាគមន៍សម្រាប់អ្នកទទួល។ ឧ។ លោក, លោកស្រី, ល។",
+Preview Email,មើលអ៊ីមែលជាមុន,
+Please select a Supplier,សូមជ្រើសរើសអ្នកផ្គត់ផ្គង់,
+Supplier Lead Time (days),ពេលវេលានាំមុខអ្នកផ្គត់ផ្គង់ (ថ្ងៃ),
+"Home, Work, etc.",ផ្ទះកន្លែងធ្វើការ។ ល។,
+Exit Interview Held On,ការសំភាសន៍ចាកចេញបានធ្វើឡើង,
+Condition and formula,លក្ខខណ្ឌនិងរូបមន្ត,
+Sets 'Target Warehouse' in each row of the Items table.,កំណត់ &#39;ឃ្លាំងគោលដៅ&#39; នៅក្នុងជួរនីមួយៗនៃតារាងធាតុ។,
+Sets 'Source Warehouse' in each row of the Items table.,កំណត់ &#39;ឃ្លាំងប្រភព&#39; នៅក្នុងជួរនីមួយៗនៃតារាងធាតុ។,
+POS Register,ចុះឈ្មោះម៉ាស៊ីនឆូតកាត,
+"Can not filter based on POS Profile, if grouped by POS Profile",មិនអាចច្រោះដោយផ្អែកលើ POS Profile ទេប្រសិនបើត្រូវបានដាក់ជាក្រុមដោយ POS Profile,
+"Can not filter based on Customer, if grouped by Customer",មិនអាចច្រោះដោយផ្អែកលើអតិថិជនប្រសិនបើដាក់ជាក្រុមដោយអតិថិជន,
+"Can not filter based on Cashier, if grouped by Cashier",មិនអាចច្រោះដោយផ្អែកលើបេឡាករបានទេប្រសិនបើដាក់ជាក្រុមដោយបេឡាករ,
+Payment Method,វិធីសាស្រ្តទូទាត់,
+"Can not filter based on Payment Method, if grouped by Payment Method",មិនអាចច្រោះដោយផ្អែកលើវិធីបង់ប្រាក់ប្រសិនបើដាក់ជាក្រុមដោយវិធីបង់ប្រាក់,
+Supplier Quotation Comparison,ការប្រៀបធៀបសម្រង់អ្នកផ្គត់ផ្គង់,
+Price per Unit (Stock UOM),តម្លៃក្នុងមួយឯកតា (ស្តុក UOM),
+Group by Supplier,ដាក់ជាក្រុមដោយអ្នកផ្គត់ផ្គង់,
+Group by Item,ដាក់ជាក្រុមតាមធាតុ,
+Remember to set {field_label}. It is required by {regulation}.,កុំភ្លេចកំណត់ {វាល - ស្លាក} ។ វាត្រូវបានទាមទារដោយ {បទប្បញ្ញត្តិ} ។,
+Enrollment Date cannot be before the Start Date of the Academic Year {0},កាលបរិច្ឆេទចុះឈ្មោះចូលរៀនមិនអាចនៅមុនកាលបរិច្ឆេទចាប់ផ្តើមនៃឆ្នាំសិក្សា {0},
+Enrollment Date cannot be after the End Date of the Academic Term {0},កាលបរិច្ឆេទចុះឈ្មោះចូលរៀនមិនអាចនៅក្រោយកាលបរិច្ឆេទបញ្ចប់នៃរយៈពេលសិក្សា {0},
+Enrollment Date cannot be before the Start Date of the Academic Term {0},កាលបរិច្ឆេទចុះឈ្មោះចូលរៀនមិនអាចនៅមុនកាលបរិច្ឆេទចាប់ផ្ដើមនៃរយៈពេលសិក្សា {០},
+Posting future transactions are not allowed due to Immutable Ledger,ការបិទផ្សាយនូវប្រតិបត្តិការនាពេលអនាគតមិនត្រូវបានអនុញ្ញាតទេដោយសារតែមិនអាចកែប្រែបាន,
+Future Posting Not Allowed,ការបិទផ្សាយអនាគតមិនត្រូវបានអនុញ្ញាតទេ,
+"To enable Capital Work in Progress Accounting, ",ដើម្បីបើកដំណើរការគណនេយ្យនៅក្នុងវឌ្ឍនភាពគណនេយ្យ,
+you must select Capital Work in Progress Account in accounts table,អ្នកត្រូវជ្រើសរើសគណនីដើមទុនក្នុងដំណើរការវឌ្ឍនភាពនៅក្នុងតារាងគណនី,
+You can also set default CWIP account in Company {},អ្នកក៏អាចកំណត់គណនី CWIP លំនាំដើមនៅក្នុងក្រុមហ៊ុន {},
+The Request for Quotation can be accessed by clicking on the following button,ការស្នើសុំដកស្រង់អាចចូលបានដោយចុចលើប៊ូតុងខាងក្រោម,
+Regards,ដោយក្តីគោរព,
+Please click on the following button to set your new password,សូមចុចលើប៊ូតុងខាងក្រោមដើម្បីកំណត់លេខសំងាត់ថ្មីរបស់អ្នក,
+Update Password,ពាក្យសម្ងាត់ធ្វើបច្ចុប្បន្នភាព,
+Row #{}: Selling rate for item {} is lower than its {}. Selling {} should be atleast {},ជួរដេក # {}៖ អត្រាលក់របស់ធាតុ {} ទាបជាង {} របស់វា។ ការលក់ {} គួរតែមានភាពអន់បំផុត {},
+You can alternatively disable selling price validation in {} to bypass this validation.,អ្នកអាចជំនួសការលក់សុពលភាពតម្លៃនៅក្នុង {} ដើម្បីចៀសវៀងសុពលភាពនេះ។,
+Invalid Selling Price,តំលៃលក់មិនត្រឹមត្រូវ,
+Address needs to be linked to a Company. Please add a row for Company in the Links table.,អាសយដ្ឋានត្រូវភ្ជាប់ទៅក្រុមហ៊ុន។ សូមបន្ថែមជួរសម្រាប់ក្រុមហ៊ុននៅក្នុងតារាងតំណ។,
+Company Not Linked,ក្រុមហ៊ុនមិនភ្ជាប់,
+Import Chart of Accounts from CSV / Excel files,នាំចូលតារាងតម្លៃគណនីពីឯកសារស៊ីអេសអេស / អេហ្វអេស,
+Completed Qty cannot be greater than 'Qty to Manufacture',Qty ដែលបានបញ្ចប់មិនអាចធំជាង“ Qty to Manufacturing” ទេ។,
+"Row {0}: For Supplier {1}, Email Address is Required to send an email",ជួរដេក {0}៖ សម្រាប់អ្នកផ្គត់ផ្គង់ {1} អាស័យដ្ឋានអ៊ីមែលត្រូវបានទាមទារដើម្បីផ្ញើអ៊ីមែល,
diff --git a/erpnext/translations/kn.csv b/erpnext/translations/kn.csv
index 7dfbb5c..9ca4776 100644
--- a/erpnext/translations/kn.csv
+++ b/erpnext/translations/kn.csv
@@ -521,7 +521,6 @@
 Chargeble,ಚಾರ್ಜ್ ಮಾಡಬಹುದಾದ,
 Charges are updated in Purchase Receipt against each item,ಆರೋಪಗಳನ್ನು ಪ್ರತಿ ಐಟಂ ವಿರುದ್ಧ ಖರೀದಿ ರಿಸೀಟ್ನ್ನು ನವೀಕರಿಸಲಾಗುವುದು,
 "Charges will be distributed proportionately based on item qty or amount, as per your selection","ಆರೋಪಗಳನ್ನು ಸೂಕ್ತ ಪ್ರಮಾಣದಲ್ಲಿ ನಿಮ್ಮ ಆಯ್ಕೆಯ ಪ್ರಕಾರ, ಐಟಂ ಪ್ರಮಾಣ ಅಥವಾ ಪ್ರಮಾಣವನ್ನು ಆಧರಿಸಿ ಹಂಚಲಾಗುತ್ತದೆ",
-Chart Of Accounts,ಖಾತೆಗಳ ಚಾರ್ಟ್,
 Chart of Cost Centers,ವೆಚ್ಚ ಸೆಂಟರ್ಸ್ ಚಾರ್ಟ್,
 Check all,ಎಲ್ಲಾ ಪರಿಶೀಲಿಸಿ,
 Checkout,ಚೆಕ್ಔಟ್,
@@ -581,7 +580,6 @@
 Compensatory Off,ಪರಿಹಾರ ಆಫ್,
 Compensatory leave request days not in valid holidays,ಕಾಂಪೆನ್ಸೇಟರಿ ರಜೆ ವಿನಂತಿಯ ದಿನಗಳು ಮಾನ್ಯ ರಜಾದಿನಗಳಲ್ಲಿಲ್ಲ,
 Complaint,ದೂರು,
-Completed Qty can not be greater than 'Qty to Manufacture',ಹೆಚ್ಚು 'ಪ್ರಮಾಣ ತಯಾರಿಸಲು' ಮುಗಿದಿದೆ ಪ್ರಮಾಣ ಹೆಚ್ಚಾಗಿರುವುದು ಸಾಧ್ಯವಿಲ್ಲ,
 Completion Date,ಪೂರ್ಣಗೊಳ್ಳುವ ದಿನಾಂಕ,
 Computer,ಗಣಕಯಂತ್ರ,
 Condition,ಪರಿಸ್ಥಿತಿ,
@@ -2033,7 +2031,6 @@
 Please select Charge Type first,ಮೊದಲ ಬ್ಯಾಚ್ ಪ್ರಕಾರವನ್ನು ಆಯ್ಕೆ ಮಾಡಿ,
 Please select Company,ಕಂಪನಿ ಆಯ್ಕೆಮಾಡಿ,
 Please select Company and Designation,ಕಂಪನಿ ಮತ್ತು ಸ್ಥಾನೀಕರಣವನ್ನು ಆಯ್ಕೆಮಾಡಿ,
-Please select Company and Party Type first,ಮೊದಲ ಕಂಪನಿ ಮತ್ತು ಪಕ್ಷದ ಕೌಟುಂಬಿಕತೆ ಆಯ್ಕೆ ಮಾಡಿ,
 Please select Company and Posting Date to getting entries,ನಮೂದುಗಳನ್ನು ಪಡೆಯಲು ಕಂಪನಿ ಮತ್ತು ಪೋಸ್ಟಿಂಗ್ ದಿನಾಂಕವನ್ನು ಆಯ್ಕೆಮಾಡಿ,
 Please select Company first,ಮೊದಲ ಕಂಪನಿ ಆಯ್ಕೆ ಮಾಡಿ,
 Please select Completion Date for Completed Asset Maintenance Log,ದಯವಿಟ್ಟು ಪೂರ್ಣಗೊಂಡ ಆಸ್ತಿ ನಿರ್ವಹಣೆ ಲಾಗ್ಗಾಗಿ ಪೂರ್ಣಗೊಂಡ ದಿನಾಂಕವನ್ನು ಆಯ್ಕೆ ಮಾಡಿ,
@@ -2980,7 +2977,6 @@
 The name of your company for which you are setting up this system.,ನೀವು ಈ ಗಣಕವನ್ನು ಹೊಂದಿಸುವ ಇದು ನಿಮ್ಮ ಕಂಪನಿ ಹೆಸರು .,
 The number of shares and the share numbers are inconsistent,ಷೇರುಗಳ ಸಂಖ್ಯೆ ಮತ್ತು ಷೇರು ಸಂಖ್ಯೆಗಳು ಅಸಮಂಜಸವಾಗಿದೆ,
 The payment gateway account in plan {0} is different from the payment gateway account in this payment request,{0} ಯೋಜನೆಯಲ್ಲಿ ಪಾವತಿ ಗೇಟ್ವೇ ಖಾತೆ ಈ ಪಾವತಿ ವಿನಂತಿಯಲ್ಲಿ ಪಾವತಿ ಗೇಟ್ವೇ ಖಾತೆಯಿಂದ ಭಿನ್ನವಾಗಿದೆ,
-The request for quotation can be accessed by clicking on the following link,ಉದ್ಧರಣ ವಿನಂತಿಯನ್ನು ಕೆಳಗಿನ ಲಿಂಕ್ ಕ್ಲಿಕ್ಕಿಸಿ ನಿಲುಕಿಸಿಕೊಳ್ಳಬಹುದು,
 The selected BOMs are not for the same item,ಆಯ್ಕೆ BOMs ಒಂದೇ ಐಟಂ ಅಲ್ಲ,
 The selected item cannot have Batch,ಆಯ್ದುಕೊಂಡ ಬ್ಯಾಚ್ ಹೊಂದುವಂತಿಲ್ಲ,
 The seller and the buyer cannot be the same,ಮಾರಾಟಗಾರ ಮತ್ತು ಖರೀದಿದಾರರು ಒಂದೇ ಆಗಿರುವುದಿಲ್ಲ,
@@ -3130,7 +3126,6 @@
 Total flexible benefit component amount {0} should not be less than max benefits {1},ಒಟ್ಟು ಹೊಂದಿಕೊಳ್ಳುವ ಲಾಭಾಂಶದ ಮೊತ್ತವು {0} ಗರಿಷ್ಠ ಪ್ರಯೋಜನಗಳಿಗಿಂತ ಕಡಿಮೆ ಇರಬಾರದು {1},
 Total hours: {0},ಒಟ್ಟು ಗಂಟೆಗಳ: {0},
 Total leaves allocated is mandatory for Leave Type {0},ನಿಯೋಜಿಸಲಾದ ಒಟ್ಟು ಎಲೆಗಳು ಲೀವ್ ಟೈಪ್ {0} ಗೆ ಕಡ್ಡಾಯವಾಗಿದೆ.,
-Total weightage assigned should be 100%. It is {0},ನಿಯೋಜಿಸಲಾಗಿದೆ ಒಟ್ಟು ಪ್ರಾಮುಖ್ಯತೆಯನ್ನು 100% ಇರಬೇಕು. ಇದು {0},
 Total working hours should not be greater than max working hours {0},ಒಟ್ಟು ಕೆಲಸದ ಗರಿಷ್ಠ ಕೆಲಸದ ಹೆಚ್ಚು ಮಾಡಬಾರದು {0},
 Total {0} ({1}),ಒಟ್ಟು {0} ({1}),
 "Total {0} for all items is zero, may be you should change 'Distribute Charges Based On'","ಒಟ್ಟು {0} ಎಲ್ಲಾ ಐಟಂಗಳನ್ನು, ಶೂನ್ಯವಾಗಿರುತ್ತದೆ ನೀವು ರಂದು ಆಧರಿಸಿ ಚಾರ್ಜಸ್ ವಿತರಿಸಿ &#39;ಬದಲಿಸಬೇಕಾಗುತ್ತದೆ ಇರಬಹುದು",
@@ -3544,7 +3539,6 @@
 Company field is required,ಕಂಪನಿ ಕ್ಷೇತ್ರದ ಅಗತ್ಯವಿದೆ,
 Creating Dimensions...,ಆಯಾಮಗಳನ್ನು ರಚಿಸಲಾಗುತ್ತಿದೆ ...,
 Duplicate entry against the item code {0} and manufacturer {1},ಐಟಂ ಕೋಡ್ {0} ಮತ್ತು ತಯಾರಕ {1} ವಿರುದ್ಧ ನಕಲು ಪ್ರವೇಶ,
-Import Chart Of Accounts from CSV / Excel files,CSV / Excel ಫೈಲ್‌ಗಳಿಂದ ಖಾತೆಗಳ ಚಾರ್ಟ್ ಅನ್ನು ಆಮದು ಮಾಡಿ,
 Invalid GSTIN! The input you've entered doesn't match the GSTIN format for UIN Holders or Non-Resident OIDAR Service Providers,ಅಮಾನ್ಯ GSTIN! ನೀವು ನಮೂದಿಸಿದ ಇನ್ಪುಟ್ ಯುಐಎನ್ ಹೊಂದಿರುವವರು ಅಥವಾ ಅನಿವಾಸಿ ಒಐಡಿಎಆರ್ ಸೇವಾ ಪೂರೈಕೆದಾರರಿಗೆ ಜಿಎಸ್ಟಿಎನ್ ಸ್ವರೂಪಕ್ಕೆ ಹೊಂದಿಕೆಯಾಗುವುದಿಲ್ಲ,
 Invoice Grand Total,ಸರಕುಪಟ್ಟಿ ಗ್ರ್ಯಾಂಡ್ ಒಟ್ಟು,
 Last carbon check date cannot be a future date,ಕೊನೆಯ ಇಂಗಾಲದ ಪರಿಶೀಲನಾ ದಿನಾಂಕ ಭವಿಷ್ಯದ ದಿನಾಂಕವಾಗಿರಬಾರದು,
@@ -3921,7 +3915,6 @@
 Plaid public token error,ಸಾರ್ವಜನಿಕ ಟೋಕನ್ ದೋಷ,
 Plaid transactions sync error,ಪ್ಲೈಡ್ ವಹಿವಾಟುಗಳು ಸಿಂಕ್ ದೋಷ,
 Please check the error log for details about the import errors,ಆಮದು ದೋಷಗಳ ವಿವರಗಳಿಗಾಗಿ ದಯವಿಟ್ಟು ದೋಷ ಲಾಗ್ ಅನ್ನು ಪರಿಶೀಲಿಸಿ,
-Please click on the following link to set your new password,ನಿಮ್ಮ ಹೊಸ ಗುಪ್ತಪದವನ್ನು ಕೆಳಗಿನ ಲಿಂಕ್ ಅನ್ನು ಕ್ಲಿಕ್ ಮಾಡಿ,
 Please create <b>DATEV Settings</b> for Company <b>{}</b>.,ದಯವಿಟ್ಟು ಕಂಪೆನಿಗೆ <b>DATEV ಸೆಟ್ಟಿಂಗ್ಗಳನ್ನು</b> <b>{ರಚಿಸಲು}.</b>,
 Please create adjustment Journal Entry for amount {0} ,ದಯವಿಟ್ಟು value 0 ಮೊತ್ತಕ್ಕೆ ಹೊಂದಾಣಿಕೆ ಜರ್ನಲ್ ನಮೂದನ್ನು ರಚಿಸಿ,
 Please do not create more than 500 items at a time,ದಯವಿಟ್ಟು ಒಂದು ಸಮಯದಲ್ಲಿ 500 ಕ್ಕೂ ಹೆಚ್ಚು ವಸ್ತುಗಳನ್ನು ರಚಿಸಬೇಡಿ,
@@ -3997,6 +3990,7 @@
 Release date must be in the future,ಬಿಡುಗಡೆ ದಿನಾಂಕ ಭವಿಷ್ಯದಲ್ಲಿರಬೇಕು,
 Relieving Date must be greater than or equal to Date of Joining,ಪರಿಹಾರ ದಿನಾಂಕವು ಸೇರುವ ದಿನಾಂಕಕ್ಕಿಂತ ದೊಡ್ಡದಾಗಿರಬೇಕು ಅಥವಾ ಸಮನಾಗಿರಬೇಕು,
 Rename,ಹೊಸ ಹೆಸರಿಡು,
+Rename Not Allowed,ಮರುಹೆಸರಿಸಲು ಅನುಮತಿಸಲಾಗಿಲ್ಲ,
 Repayment Method is mandatory for term loans,ಟರ್ಮ್ ಸಾಲಗಳಿಗೆ ಮರುಪಾವತಿ ವಿಧಾನ ಕಡ್ಡಾಯವಾಗಿದೆ,
 Repayment Start Date is mandatory for term loans,ಅವಧಿ ಸಾಲಗಳಿಗೆ ಮರುಪಾವತಿ ಪ್ರಾರಂಭ ದಿನಾಂಕ ಕಡ್ಡಾಯವಾಗಿದೆ,
 Report Item,ಐಟಂ ವರದಿ ಮಾಡಿ,
@@ -4043,7 +4037,6 @@
 Select All,ಎಲ್ಲಾ ಆಯ್ಕೆಮಾಡಿ,
 Select Difference Account,ವ್ಯತ್ಯಾಸ ಖಾತೆ ಆಯ್ಕೆಮಾಡಿ,
 Select a Default Priority.,ಡೀಫಾಲ್ಟ್ ಆದ್ಯತೆಯನ್ನು ಆಯ್ಕೆಮಾಡಿ.,
-Select a Supplier from the Default Supplier List of the items below.,ಕೆಳಗಿನ ಐಟಂಗಳ ಡೀಫಾಲ್ಟ್ ಸರಬರಾಜುದಾರರ ಪಟ್ಟಿಯಿಂದ ಸರಬರಾಜುದಾರರನ್ನು ಆಯ್ಕೆಮಾಡಿ.,
 Select a company,ಕಂಪನಿಯನ್ನು ಆಯ್ಕೆ ಮಾಡಿ,
 Select finance book for the item {0} at row {1},{1 row ಸಾಲಿನಲ್ಲಿ {0 item ಐಟಂಗೆ ಹಣಕಾಸು ಪುಸ್ತಕವನ್ನು ಆಯ್ಕೆಮಾಡಿ,
 Select only one Priority as Default.,ಡೀಫಾಲ್ಟ್ ಆಗಿ ಕೇವಲ ಒಂದು ಆದ್ಯತೆಯನ್ನು ಆಯ್ಕೆಮಾಡಿ.,
@@ -4247,7 +4240,6 @@
 Actual ,ವಾಸ್ತವಿಕ,
 Add to cart,ಕಾರ್ಟ್ ಸೇರಿಸಿ,
 Budget,ಮುಂಗಡಪತ್ರ,
-Chart Of Accounts Importer,ಖಾತೆಗಳ ಆಮದುದಾರರ ಚಾರ್ಟ್,
 Chart of Accounts,ಖಾತೆಗಳ ಚಾರ್ಟ್,
 Customer database.,ಗ್ರಾಹಕ ಡೇಟಾಬೇಸ್.,
 Days Since Last order,ದಿನಗಳಿಂದಲೂ ಕೊನೆಯ ಆರ್ಡರ್,
@@ -4546,7 +4538,6 @@
 Check Supplier Invoice Number Uniqueness,ಚೆಕ್ ಸರಬರಾಜುದಾರ ಸರಕುಪಟ್ಟಿ ಸಂಖ್ಯೆ ವೈಶಿಷ್ಟ್ಯ,
 Make Payment via Journal Entry,ಜರ್ನಲ್ ಎಂಟ್ರಿ ಮೂಲಕ ಪಾವತಿ ಮಾಡಲು,
 Unlink Payment on Cancellation of Invoice,ಸರಕುಪಟ್ಟಿ ರದ್ದು ಮೇಲೆ ಪಾವತಿ ಅನ್ಲಿಂಕ್,
-Unlink Advance Payment on Cancelation of Order,ಆದೇಶವನ್ನು ರದ್ದುಗೊಳಿಸುವ ಕುರಿತು ಮುಂಗಡ ಪಾವತಿಯನ್ನು ಅನ್ಲಿಂಕ್ ಮಾಡಿ,
 Book Asset Depreciation Entry Automatically,ಪುಸ್ತಕ ಸ್ವತ್ತು ಸವಕಳಿ ಎಂಟ್ರಿ ಸ್ವಯಂಚಾಲಿತವಾಗಿ,
 Automatically Add Taxes and Charges from Item Tax Template,ಐಟಂ ತೆರಿಗೆ ಟೆಂಪ್ಲೇಟ್‌ನಿಂದ ತೆರಿಗೆಗಳು ಮತ್ತು ಶುಲ್ಕಗಳನ್ನು ಸ್ವಯಂಚಾಲಿತವಾಗಿ ಸೇರಿಸಿ,
 Automatically Fetch Payment Terms,ಪಾವತಿ ನಿಯಮಗಳನ್ನು ಸ್ವಯಂಚಾಲಿತವಾಗಿ ಪಡೆದುಕೊಳ್ಳಿ,
@@ -4940,7 +4931,6 @@
 POS Customer Group,ಪಿಓಎಸ್ ಗ್ರಾಹಕ ಗುಂಪಿನ,
 POS Field,ಪಿಒಎಸ್ ಕ್ಷೇತ್ರ,
 POS Item Group,ಪಿಓಎಸ್ ಐಟಂ ಗ್ರೂಪ್,
-[Select],[ ಆರಿಸಿರಿ ],
 Company Address,ಕಂಪೆನಿ ವಿಳಾಸ,
 Update Stock,ಸ್ಟಾಕ್ ನವೀಕರಿಸಲು,
 Ignore Pricing Rule,ಬೆಲೆ ರೂಲ್ ನಿರ್ಲಕ್ಷಿಸು,
@@ -6481,7 +6471,6 @@
 Appraisal Template,ಅಪ್ರೇಸಲ್ ಟೆಂಪ್ಲೇಟು,
 For Employee Name,ನೌಕರರ ಹೆಸರು,
 Goals,ಗುರಿಗಳು,
-Calculate Total Score,ಒಟ್ಟು ಸ್ಕೋರ್ ಲೆಕ್ಕ,
 Total Score (Out of 5),ಒಟ್ಟು ಸ್ಕೋರ್ ( 5),
 "Any other remarks, noteworthy effort that should go in the records.","ಯಾವುದೇ ಟೀಕೆಗಳನ್ನು, ದಾಖಲೆಗಳಲ್ಲಿ ಹೋಗಬೇಕು ಎಂದು ವಿವರಣೆಯಾಗಿದೆ ಪ್ರಯತ್ನ.",
 Appraisal Goal,ಅಪ್ರೇಸಲ್ ಗೋಲ್,
@@ -6599,11 +6588,6 @@
 Reason for Leaving,ಲೀವಿಂಗ್ ಕಾರಣ,
 Leave Encashed?,Encashed ಬಿಡಿ ?,
 Encashment Date,ನಗದೀಕರಣ ದಿನಾಂಕ,
-Exit Interview Details,ಎಕ್ಸಿಟ್ ಸಂದರ್ಶನ ವಿವರಗಳು,
-Held On,ನಡೆದ,
-Reason for Resignation,ರಾಜೀನಾಮೆಗೆ ಕಾರಣ,
-Better Prospects,ಉತ್ತಮ ಜೀವನ,
-Health Concerns,ಆರೋಗ್ಯ ಕಾಳಜಿ,
 New Workplace,ಹೊಸ ಕೆಲಸದ,
 HR-EAD-.YYYY.-,HR-EAD-YYYY.-,
 Returned Amount,ಹಿಂತಿರುಗಿದ ಮೊತ್ತ,
@@ -8239,9 +8223,6 @@
 Manufacturers used in Items,ವಸ್ತುಗಳ ತಯಾರಿಕೆಯಲ್ಲಿ ತಯಾರಕರು,
 Limited to 12 characters,"12 ಪಾತ್ರಗಳು,",
 MAT-MR-.YYYY.-,MAT-MR-YYYY.-,
-Set Warehouse,ಗೋದಾಮು ಹೊಂದಿಸಿ,
-Sets 'For Warehouse' in each row of the Items table.,ಐಟಂಗಳ ಕೋಷ್ಟಕದ ಪ್ರತಿಯೊಂದು ಸಾಲಿನಲ್ಲಿ &#39;ಗೋದಾಮಿಗಾಗಿ&#39; ಹೊಂದಿಸುತ್ತದೆ.,
-Requested For,ಮನವಿ,
 Partially Ordered,ಭಾಗಶಃ ಆದೇಶಿಸಲಾಗಿದೆ,
 Transferred,ವರ್ಗಾಯಿಸಲ್ಪಟ್ಟ,
 % Ordered,% ಆದೇಶ,
@@ -8690,8 +8671,6 @@
 Select warehouse for material requests,ವಸ್ತು ವಿನಂತಿಗಳಿಗಾಗಿ ಗೋದಾಮು ಆಯ್ಕೆಮಾಡಿ,
 Transfer Materials For Warehouse {0},ಗೋದಾಮಿನ ಸಾಮಗ್ರಿಗಳನ್ನು ವರ್ಗಾಯಿಸಿ {0},
 Production Plan Material Request Warehouse,ಉತ್ಪಾದನಾ ಯೋಜನೆ ವಸ್ತು ವಿನಂತಿ ಗೋದಾಮು,
-Set From Warehouse,ಗೋದಾಮಿನಿಂದ ಹೊಂದಿಸಿ,
-Source Warehouse (Material Transfer),ಮೂಲ ಗೋದಾಮು (ವಸ್ತು ವರ್ಗಾವಣೆ),
 Sets 'Source Warehouse' in each row of the items table.,ಐಟಂಗಳ ಟೇಬಲ್‌ನ ಪ್ರತಿಯೊಂದು ಸಾಲಿನಲ್ಲಿ &#39;ಮೂಲ ಗೋದಾಮು&#39; ಹೊಂದಿಸುತ್ತದೆ.,
 Sets 'Target Warehouse' in each row of the items table.,ಐಟಂಗಳ ಟೇಬಲ್‌ನ ಪ್ರತಿಯೊಂದು ಸಾಲಿನಲ್ಲಿ &#39;ಟಾರ್ಗೆಟ್ ವೇರ್‌ಹೌಸ್&#39; ಅನ್ನು ಹೊಂದಿಸುತ್ತದೆ.,
 Show Cancelled Entries,ರದ್ದಾದ ನಮೂದುಗಳನ್ನು ತೋರಿಸಿ,
@@ -9157,7 +9136,6 @@
 Is Income Tax Component,ಆದಾಯ ತೆರಿಗೆ ಘಟಕವಾಗಿದೆ,
 Component properties and references ,ಘಟಕ ಗುಣಲಕ್ಷಣಗಳು ಮತ್ತು ಉಲ್ಲೇಖಗಳು,
 Additional Salary ,ಹೆಚ್ಚುವರಿ ಸಂಬಳ,
-Condtion and formula,ಸ್ಥಿತಿ ಮತ್ತು ಸೂತ್ರ,
 Unmarked days,ಗುರುತು ಹಾಕದ ದಿನಗಳು,
 Absent Days,ಅನುಪಸ್ಥಿತಿಯ ದಿನಗಳು,
 Conditions and Formula variable and example,ಷರತ್ತುಗಳು ಮತ್ತು ಫಾರ್ಮುಲಾ ವೇರಿಯಬಲ್ ಮತ್ತು ಉದಾಹರಣೆ,
@@ -9444,7 +9422,6 @@
 Please check your Plaid client ID and secret values,ದಯವಿಟ್ಟು ನಿಮ್ಮ ಪ್ಲೈಡ್ ಕ್ಲೈಂಟ್ ಐಡಿ ಮತ್ತು ರಹಸ್ಯ ಮೌಲ್ಯಗಳನ್ನು ಪರಿಶೀಲಿಸಿ,
 Bank transaction creation error,ಬ್ಯಾಂಕ್ ವಹಿವಾಟು ರಚನೆ ದೋಷ,
 Unit of Measurement,ಅಳತೆಯ ಘಟಕ,
-Row #{}: Selling rate for item {} is lower than its {}. Selling rate should be atleast {},ಸಾಲು # {}: ಐಟಂ for for ಗೆ ಮಾರಾಟ ದರ ಅದರ than than ಗಿಂತ ಕಡಿಮೆಯಾಗಿದೆ. ಮಾರಾಟ ದರ ಕನಿಷ್ಠ be} ಆಗಿರಬೇಕು,
 Fiscal Year {0} Does Not Exist,ಹಣಕಾಸಿನ ವರ್ಷ {0 Ex ಅಸ್ತಿತ್ವದಲ್ಲಿಲ್ಲ,
 Row # {0}: Returned Item {1} does not exist in {2} {3},ಸಾಲು # {0}: ಹಿಂತಿರುಗಿದ ಐಟಂ {1} {2} {3 in ನಲ್ಲಿ ಅಸ್ತಿತ್ವದಲ್ಲಿಲ್ಲ,
 Valuation type charges can not be marked as Inclusive,ಮೌಲ್ಯಮಾಪನ ಪ್ರಕಾರದ ಶುಲ್ಕಗಳನ್ನು ಅಂತರ್ಗತ ಎಂದು ಗುರುತಿಸಲು ಸಾಧ್ಯವಿಲ್ಲ,
@@ -9598,8 +9575,60 @@
 Response Time for {0} priority in row {1} can't be greater than Resolution Time.,{1 row ಸಾಲಿನಲ್ಲಿ {0} ಆದ್ಯತೆಯ ಪ್ರತಿಕ್ರಿಯೆ ಸಮಯ ರೆಸಲ್ಯೂಶನ್ ಸಮಯಕ್ಕಿಂತ ಹೆಚ್ಚಿರಬಾರದು.,
 {0} is not enabled in {1},{0 in ಅನ್ನು {1 in ನಲ್ಲಿ ಸಕ್ರಿಯಗೊಳಿಸಲಾಗಿಲ್ಲ,
 Group by Material Request,ವಸ್ತು ವಿನಂತಿಯ ಪ್ರಕಾರ ಗುಂಪು,
-"Row {0}: For Supplier {0}, Email Address is Required to Send Email","ಸಾಲು {0}: ಪೂರೈಕೆದಾರ {0 For ಗೆ, ಇಮೇಲ್ ಕಳುಹಿಸಲು ಇಮೇಲ್ ವಿಳಾಸದ ಅಗತ್ಯವಿದೆ",
 Email Sent to Supplier {0},ಇಮೇಲ್ ಸರಬರಾಜುದಾರರಿಗೆ ಕಳುಹಿಸಲಾಗಿದೆ {0},
 "The Access to Request for Quotation From Portal is Disabled. To Allow Access, Enable it in Portal Settings.","ಪೋರ್ಟಲ್‌ನಿಂದ ಉದ್ಧರಣಕ್ಕಾಗಿ ವಿನಂತಿಯ ಪ್ರವೇಶವನ್ನು ನಿಷ್ಕ್ರಿಯಗೊಳಿಸಲಾಗಿದೆ. ಪ್ರವೇಶವನ್ನು ಅನುಮತಿಸಲು, ಪೋರ್ಟಲ್ ಸೆಟ್ಟಿಂಗ್‌ಗಳಲ್ಲಿ ಅದನ್ನು ಸಕ್ರಿಯಗೊಳಿಸಿ.",
 Supplier Quotation {0} Created,ಪೂರೈಕೆದಾರ ಉದ್ಧರಣ {0} ರಚಿಸಲಾಗಿದೆ,
 Valid till Date cannot be before Transaction Date,ವಹಿವಾಟು ದಿನಾಂಕದ ಮೊದಲು ದಿನಾಂಕದವರೆಗೆ ಮಾನ್ಯವಾಗಿಲ್ಲ,
+Unlink Advance Payment on Cancellation of Order,ಆದೇಶವನ್ನು ರದ್ದುಗೊಳಿಸುವ ಕುರಿತು ಮುಂಗಡ ಪಾವತಿಯನ್ನು ಅನ್ಲಿಂಕ್ ಮಾಡಿ,
+"Simple Python Expression, Example: territory != 'All Territories'","ಸರಳ ಪೈಥಾನ್ ಅಭಿವ್ಯಕ್ತಿ, ಉದಾಹರಣೆ: ಪ್ರದೇಶ! = &#39;ಎಲ್ಲಾ ಪ್ರಾಂತ್ಯಗಳು&#39;",
+Sales Contributions and Incentives,ಮಾರಾಟ ಕೊಡುಗೆಗಳು ಮತ್ತು ಪ್ರೋತ್ಸಾಹಕಗಳು,
+Sourced by Supplier,ಸರಬರಾಜುದಾರರಿಂದ ಹುಳಿ,
+Total weightage assigned should be 100%.<br>It is {0},ನಿಗದಿಪಡಿಸಿದ ಒಟ್ಟು ತೂಕ 100% ಆಗಿರಬೇಕು.<br> ಇದು {0},
+Account {0} exists in parent company {1}.,ಪೋಷಕ ಕಂಪನಿ {1 in ನಲ್ಲಿ ಖಾತೆ {0} ಅಸ್ತಿತ್ವದಲ್ಲಿದೆ.,
+"To overrule this, enable '{0}' in company {1}","ಇದನ್ನು ರದ್ದುಗೊಳಿಸಲು, {1 company ಕಂಪನಿಯಲ್ಲಿ &#39;{0}&#39; ಅನ್ನು ಸಕ್ರಿಯಗೊಳಿಸಿ",
+Invalid condition expression,ಅಮಾನ್ಯ ಸ್ಥಿತಿ ಅಭಿವ್ಯಕ್ತಿ,
+Please Select a Company First,ದಯವಿಟ್ಟು ಮೊದಲು ಕಂಪನಿಯನ್ನು ಆಯ್ಕೆ ಮಾಡಿ,
+Please Select Both Company and Party Type First,ದಯವಿಟ್ಟು ಮೊದಲು ಕಂಪನಿ ಮತ್ತು ಪಕ್ಷದ ಪ್ರಕಾರ ಎರಡನ್ನೂ ಆಯ್ಕೆ ಮಾಡಿ,
+Provide the invoice portion in percent,ಸರಕುಪಟ್ಟಿ ಭಾಗವನ್ನು ಶೇಕಡಾವಾರು ಒದಗಿಸಿ,
+Give number of days according to prior selection,ಪೂರ್ವ ಆಯ್ಕೆಯ ಪ್ರಕಾರ ದಿನಗಳ ಸಂಖ್ಯೆಯನ್ನು ನೀಡಿ,
+Email Details,ಇಮೇಲ್ ವಿವರಗಳು,
+"Select a greeting for the receiver. E.g. Mr., Ms., etc.","ಸ್ವೀಕರಿಸುವವರಿಗೆ ಶುಭಾಶಯ ಆಯ್ಕೆಮಾಡಿ. ಉದಾ. ಶ್ರೀ, ಮಿಸ್, ಇತ್ಯಾದಿ.",
+Preview Email,ಇಮೇಲ್ ಪೂರ್ವವೀಕ್ಷಣೆ ಮಾಡಿ,
+Please select a Supplier,ದಯವಿಟ್ಟು ಸರಬರಾಜುದಾರರನ್ನು ಆಯ್ಕೆ ಮಾಡಿ,
+Supplier Lead Time (days),ಸರಬರಾಜುದಾರರ ಪ್ರಮುಖ ಸಮಯ (ದಿನಗಳು),
+"Home, Work, etc.","ಮನೆ, ಕೆಲಸ ಇತ್ಯಾದಿ.",
+Exit Interview Held On,ಸಂದರ್ಶನದಿಂದ ನಿರ್ಗಮಿಸಿ,
+Condition and formula,ಸ್ಥಿತಿ ಮತ್ತು ಸೂತ್ರ,
+Sets 'Target Warehouse' in each row of the Items table.,ಐಟಂಗಳ ಟೇಬಲ್‌ನ ಪ್ರತಿಯೊಂದು ಸಾಲಿನಲ್ಲಿ &#39;ಟಾರ್ಗೆಟ್ ವೇರ್‌ಹೌಸ್&#39; ಅನ್ನು ಹೊಂದಿಸುತ್ತದೆ.,
+Sets 'Source Warehouse' in each row of the Items table.,ಐಟಂಗಳ ಕೋಷ್ಟಕದ ಪ್ರತಿಯೊಂದು ಸಾಲಿನಲ್ಲಿ &#39;ಮೂಲ ಗೋದಾಮು&#39; ಹೊಂದಿಸುತ್ತದೆ.,
+POS Register,ಪಿಓಎಸ್ ರಿಜಿಸ್ಟರ್,
+"Can not filter based on POS Profile, if grouped by POS Profile",ಪಿಒಎಸ್ ಪ್ರೊಫೈಲ್‌ನಿಂದ ಗುಂಪು ಮಾಡಿದರೆ ಪಿಒಎಸ್ ಪ್ರೊಫೈಲ್ ಆಧರಿಸಿ ಫಿಲ್ಟರ್ ಮಾಡಲು ಸಾಧ್ಯವಿಲ್ಲ,
+"Can not filter based on Customer, if grouped by Customer",ಗ್ರಾಹಕರಿಂದ ಗುಂಪು ಮಾಡಿದ್ದರೆ ಗ್ರಾಹಕರ ಆಧಾರದ ಮೇಲೆ ಫಿಲ್ಟರ್ ಮಾಡಲು ಸಾಧ್ಯವಿಲ್ಲ,
+"Can not filter based on Cashier, if grouped by Cashier",ಕ್ಯಾಷಿಯರ್‌ನಿಂದ ಗುಂಪು ಮಾಡಿದ್ದರೆ ಕ್ಯಾಷಿಯರ್ ಆಧರಿಸಿ ಫಿಲ್ಟರ್ ಮಾಡಲು ಸಾಧ್ಯವಿಲ್ಲ,
+Payment Method,ಪಾವತಿ ವಿಧಾನ,
+"Can not filter based on Payment Method, if grouped by Payment Method",ಪಾವತಿ ವಿಧಾನದಿಂದ ಗುಂಪು ಮಾಡಿದ್ದರೆ ಪಾವತಿ ವಿಧಾನವನ್ನು ಆಧರಿಸಿ ಫಿಲ್ಟರ್ ಮಾಡಲು ಸಾಧ್ಯವಿಲ್ಲ,
+Supplier Quotation Comparison,ಪೂರೈಕೆದಾರ ಉದ್ಧರಣ ಹೋಲಿಕೆ,
+Price per Unit (Stock UOM),ಪ್ರತಿ ಯೂನಿಟ್‌ಗೆ ಬೆಲೆ (ಸ್ಟಾಕ್ ಯುಒಎಂ),
+Group by Supplier,ಸರಬರಾಜುದಾರರಿಂದ ಗುಂಪು,
+Group by Item,ಐಟಂ ಪ್ರಕಾರ ಗುಂಪು,
+Remember to set {field_label}. It is required by {regulation}.,{Field_label set ಅನ್ನು ಹೊಂದಿಸಲು ಮರೆಯದಿರಿ. {ನಿಯಂತ್ರಣ by ನಿಂದ ಇದು ಅಗತ್ಯವಿದೆ.,
+Enrollment Date cannot be before the Start Date of the Academic Year {0},ದಾಖಲಾತಿ ದಿನಾಂಕ ಶೈಕ್ಷಣಿಕ ವರ್ಷದ ಪ್ರಾರಂಭ ದಿನಾಂಕಕ್ಕಿಂತ ಮೊದಲು ಇರಬಾರದು {0},
+Enrollment Date cannot be after the End Date of the Academic Term {0},ದಾಖಲಾತಿ ದಿನಾಂಕ ಶೈಕ್ಷಣಿಕ ಅವಧಿಯ ಅಂತಿಮ ದಿನಾಂಕದ ನಂತರ ಇರಬಾರದು {0},
+Enrollment Date cannot be before the Start Date of the Academic Term {0},ದಾಖಲಾತಿ ದಿನಾಂಕ ಶೈಕ್ಷಣಿಕ ಅವಧಿಯ ಪ್ರಾರಂಭ ದಿನಾಂಕಕ್ಕಿಂತ ಮೊದಲು ಇರಬಾರದು {0},
+Posting future transactions are not allowed due to Immutable Ledger,ಬದಲಾಯಿಸಲಾಗದ ಲೆಡ್ಜರ್‌ನಿಂದಾಗಿ ಭವಿಷ್ಯದ ವಹಿವಾಟುಗಳನ್ನು ಪೋಸ್ಟ್ ಮಾಡಲು ಅನುಮತಿಸಲಾಗುವುದಿಲ್ಲ,
+Future Posting Not Allowed,ಭವಿಷ್ಯದ ಪೋಸ್ಟ್ ಮಾಡಲು ಅನುಮತಿಸಲಾಗುವುದಿಲ್ಲ,
+"To enable Capital Work in Progress Accounting, ","ಪ್ರೋಗ್ರೆಸ್ ಅಕೌಂಟಿಂಗ್‌ನಲ್ಲಿ ಕ್ಯಾಪಿಟಲ್ ವರ್ಕ್ ಅನ್ನು ಸಕ್ರಿಯಗೊಳಿಸಲು,",
+you must select Capital Work in Progress Account in accounts table,ಖಾತೆಗಳ ಕೋಷ್ಟಕದಲ್ಲಿ ನೀವು ಪ್ರಗತಿ ಖಾತೆಯಲ್ಲಿ ಕ್ಯಾಪಿಟಲ್ ವರ್ಕ್ ಅನ್ನು ಆರಿಸಬೇಕು,
+You can also set default CWIP account in Company {},ಕಂಪನಿ} in ನಲ್ಲಿ ನೀವು ಡೀಫಾಲ್ಟ್ ಸಿಡಬ್ಲ್ಯುಐಪಿ ಖಾತೆಯನ್ನು ಸಹ ಹೊಂದಿಸಬಹುದು,
+The Request for Quotation can be accessed by clicking on the following button,ಕೆಳಗಿನ ಗುಂಡಿಯನ್ನು ಕ್ಲಿಕ್ ಮಾಡುವುದರ ಮೂಲಕ ಉದ್ಧರಣಕ್ಕಾಗಿ ವಿನಂತಿಯನ್ನು ಪ್ರವೇಶಿಸಬಹುದು,
+Regards,ಅಭಿನಂದನೆಗಳು,
+Please click on the following button to set your new password,ನಿಮ್ಮ ಹೊಸ ಪಾಸ್‌ವರ್ಡ್ ಹೊಂದಿಸಲು ದಯವಿಟ್ಟು ಕೆಳಗಿನ ಬಟನ್ ಕ್ಲಿಕ್ ಮಾಡಿ,
+Update Password,ಪಾಸ್ವರ್ಡ್ ನವೀಕರಿಸಿ,
+Row #{}: Selling rate for item {} is lower than its {}. Selling {} should be atleast {},ಸಾಲು # {}: ಐಟಂ for for ಗೆ ಮಾರಾಟ ದರ ಅದರ than than ಗಿಂತ ಕಡಿಮೆಯಾಗಿದೆ. {Seling ಕನಿಷ್ಠ ಮಾರಾಟವಾಗಬೇಕು {},
+You can alternatively disable selling price validation in {} to bypass this validation.,ಈ ation ರ್ಜಿತಗೊಳಿಸುವಿಕೆಯನ್ನು ಬೈಪಾಸ್ ಮಾಡಲು ನೀವು ಪರ್ಯಾಯವಾಗಿ price in ನಲ್ಲಿ ಮಾರಾಟದ ಬೆಲೆ ಮೌಲ್ಯಮಾಪನವನ್ನು ನಿಷ್ಕ್ರಿಯಗೊಳಿಸಬಹುದು.,
+Invalid Selling Price,ಅಮಾನ್ಯ ಮಾರಾಟ ಬೆಲೆ,
+Address needs to be linked to a Company. Please add a row for Company in the Links table.,ವಿಳಾಸವನ್ನು ಕಂಪನಿಗೆ ಲಿಂಕ್ ಮಾಡಬೇಕಾಗಿದೆ. ದಯವಿಟ್ಟು ಲಿಂಕ್‌ಗಳ ಕೋಷ್ಟಕದಲ್ಲಿ ಕಂಪನಿಗೆ ಒಂದು ಸಾಲನ್ನು ಸೇರಿಸಿ.,
+Company Not Linked,ಕಂಪನಿ ಲಿಂಕ್ ಮಾಡಿಲ್ಲ,
+Import Chart of Accounts from CSV / Excel files,CSV / Excel ಫೈಲ್‌ಗಳಿಂದ ಖಾತೆಗಳ ಆಮದು ಚಾರ್ಟ್,
+Completed Qty cannot be greater than 'Qty to Manufacture',ಪೂರ್ಣಗೊಂಡ ಕ್ಯೂಟಿ &#39;ಉತ್ಪಾದನೆಗೆ ಕ್ಯೂಟಿ&#39; ಗಿಂತ ಹೆಚ್ಚಿರಬಾರದು,
+"Row {0}: For Supplier {1}, Email Address is Required to send an email","ಸಾಲು {0}: ಸರಬರಾಜುದಾರ {1 For ಗೆ, ಇಮೇಲ್ ಕಳುಹಿಸಲು ಇಮೇಲ್ ವಿಳಾಸದ ಅಗತ್ಯವಿದೆ",
diff --git a/erpnext/translations/ko.csv b/erpnext/translations/ko.csv
index cf25b92..43c453b 100644
--- a/erpnext/translations/ko.csv
+++ b/erpnext/translations/ko.csv
@@ -521,7 +521,6 @@
 Chargeble,Chileble,
 Charges are updated in Purchase Receipt against each item,요금은 각 항목에 대해 구매 영수증에 업데이트됩니다,
 "Charges will be distributed proportionately based on item qty or amount, as per your selection","요금은 비례 적으로 사용자의 선택에 따라, 상품 수량 또는 금액에 따라 배포됩니다",
-Chart Of Accounts,계정 차트,
 Chart of Cost Centers,코스트 센터의 차트,
 Check all,모두 확인,
 Checkout,점검,
@@ -581,7 +580,6 @@
 Compensatory Off,보상 오프,
 Compensatory leave request days not in valid holidays,유효한 휴가가 아닌 보상 휴가 요청 일,
 Complaint,불평,
-Completed Qty can not be greater than 'Qty to Manufacture',보다 '수량 제조하는'완료 수량은 클 수 없습니다,
 Completion Date,완료일,
 Computer,컴퓨터,
 Condition,조건,
@@ -2033,7 +2031,6 @@
 Please select Charge Type first,충전 유형을 먼저 선택하세요,
 Please select Company,회사를 선택하세요,
 Please select Company and Designation,회사 명 및 지명을 선택하십시오.,
-Please select Company and Party Type first,첫번째 회사와 파티 유형을 선택하세요,
 Please select Company and Posting Date to getting entries,항목을 얻으려면 회사 및 전기 일을 선택하십시오.,
 Please select Company first,처음 회사를 선택하세요,
 Please select Completion Date for Completed Asset Maintenance Log,Completed Asset Maintenance Log의 완료 날짜를 선택하십시오.,
@@ -2980,7 +2977,6 @@
 The name of your company for which you are setting up this system.,이 시스템을 설정하는하는 기업의 이름입니다.,
 The number of shares and the share numbers are inconsistent,주식 수와 주식 수는 일치하지 않습니다.,
 The payment gateway account in plan {0} is different from the payment gateway account in this payment request,{0} 계획의 지불 게이트웨이 계정이이 지불 요청의 지불 게이트웨이 계정과 다릅니다.,
-The request for quotation can be accessed by clicking on the following link,견적 요청은 다음 링크를 클릭하여 액세스 할 수 있습니다,
 The selected BOMs are not for the same item,선택한 BOM의 동일한 항목에 대한 없습니다,
 The selected item cannot have Batch,선택한 항목이 배치를 가질 수 없습니다,
 The seller and the buyer cannot be the same,판매자와 구매자는 같을 수 없습니다.,
@@ -3130,7 +3126,6 @@
 Total flexible benefit component amount {0} should not be less than max benefits {1},총 탄력적 인 혜택 구성 요소 금액 {0}은 최대 이점보다 적어서는 안됩니다 {1},
 Total hours: {0},총 시간 : {0},
 Total leaves allocated is mandatory for Leave Type {0},할당 된 총 나뭇잎 수는 {0} 휴가 유형의 경우 필수입니다.,
-Total weightage assigned should be 100%. It is {0},할당 된 총 weightage 100 %이어야한다.그것은 {0},
 Total working hours should not be greater than max working hours {0},총 근무 시간은 최대 근무 시간보다 더 안 {0},
 Total {0} ({1}),총 {0} ({1}),
 "Total {0} for all items is zero, may be you should change 'Distribute Charges Based On'","총 {0} 모든 항목에 대해 당신이 &#39;를 기반으로 요금을 분배&#39;변경해야 할 수있다, 제로",
@@ -3544,7 +3539,6 @@
 Company field is required,회사 필드가 필요합니다.,
 Creating Dimensions...,치수 만들기 ...,
 Duplicate entry against the item code {0} and manufacturer {1},항목 코드 {0} 및 제조업체 {1}에 대한 중복 항목,
-Import Chart Of Accounts from CSV / Excel files,CSV / Excel 파일에서 Chart of Accounts 가져 오기,
 Invalid GSTIN! The input you've entered doesn't match the GSTIN format for UIN Holders or Non-Resident OIDAR Service Providers,GSTIN이 잘못되었습니다! 입력 한 입력 내용이 UIN 소지자 또는 비거주 OIDAR 서비스 공급자의 GSTIN 형식과 일치하지 않습니다.,
 Invoice Grand Total,인보이스 총액,
 Last carbon check date cannot be a future date,마지막 탄소 체크 날짜는 미래 날짜가 될 수 없습니다.,
@@ -3921,7 +3915,6 @@
 Plaid public token error,격자 무늬 공용 토큰 오류,
 Plaid transactions sync error,격자 무늬 거래 동기화 오류,
 Please check the error log for details about the import errors,가져 오기 오류에 대한 자세한 내용은 오류 로그를 확인하십시오.,
-Please click on the following link to set your new password,새 암호를 설정하려면 다음 링크를 클릭하십시오,
 Please create <b>DATEV Settings</b> for Company <b>{}</b>.,회사 <b>{}에</b> 대한 <b>DATEV 설정</b> 을 작성하십시오.,
 Please create adjustment Journal Entry for amount {0} ,금액 {0}에 대한 조정 분개를 생성하십시오,
 Please do not create more than 500 items at a time,한 번에 500 개 이상의 항목을 만들지 마세요.,
@@ -3997,6 +3990,7 @@
 Release date must be in the future,출시 날짜가 미래 여야합니다.,
 Relieving Date must be greater than or equal to Date of Joining,완화 날짜는 가입 날짜보다 크거나 같아야합니다.,
 Rename,이름,
+Rename Not Allowed,허용되지 않는 이름 바꾸기,
 Repayment Method is mandatory for term loans,상환 방법은 기간 대출에 필수적입니다,
 Repayment Start Date is mandatory for term loans,상환 시작 날짜는 기간 대출에 필수입니다,
 Report Item,보고서 항목,
@@ -4043,7 +4037,6 @@
 Select All,모두 선택,
 Select Difference Account,차이 계정 선택,
 Select a Default Priority.,기본 우선 순위를 선택하십시오.,
-Select a Supplier from the Default Supplier List of the items below.,아래 항목의 기본 공급 업체 목록에서 공급 업체를 선택하십시오.,
 Select a company,회사 선택,
 Select finance book for the item {0} at row {1},{1} 행의 항목 {0}에 대한 재무 책을 선택하십시오.,
 Select only one Priority as Default.,Priority as Default를 하나만 선택하십시오.,
@@ -4247,7 +4240,6 @@
 Actual ,실제,
 Add to cart,쇼핑 카트에 담기,
 Budget,예산,
-Chart Of Accounts Importer,계정 수입 차트,
 Chart of Accounts,회계 계통도,
 Customer database.,고객 데이터베이스.,
 Days Since Last order,일 이후 마지막 주문,
@@ -4546,7 +4538,6 @@
 Check Supplier Invoice Number Uniqueness,체크 공급 업체 송장 번호 특이 사항,
 Make Payment via Journal Entry,분개를 통해 결제하기,
 Unlink Payment on Cancellation of Invoice,송장의 취소에 지불 연결 해제,
-Unlink Advance Payment on Cancelation of Order,주문 취소시 사전 지불 연결 해제,
 Book Asset Depreciation Entry Automatically,장부 자산 감가 상각 항목 자동 입력,
 Automatically Add Taxes and Charges from Item Tax Template,항목 세금 템플릿에서 세금 및 요금 자동 추가,
 Automatically Fetch Payment Terms,지불 조건 자동 가져 오기,
@@ -4940,7 +4931,6 @@
 POS Customer Group,POS 고객 그룹,
 POS Field,POS 분야,
 POS Item Group,POS 항목 그룹,
-[Select],[선택],
 Company Address,회사 주소,
 Update Stock,재고 업데이트,
 Ignore Pricing Rule,가격 규칙을 무시,
@@ -6481,7 +6471,6 @@
 Appraisal Template,평가 템플릿,
 For Employee Name,직원 이름에,
 Goals,목표,
-Calculate Total Score,총 점수를 계산,
 Total Score (Out of 5),전체 점수 (5 점 만점),
 "Any other remarks, noteworthy effort that should go in the records.","다른 발언, 기록에 가야한다 주목할만한 노력.",
 Appraisal Goal,평가목표,
@@ -6599,11 +6588,6 @@
 Reason for Leaving,떠나는 이유,
 Leave Encashed?,Encashed 남겨?,
 Encashment Date,현금화 날짜,
-Exit Interview Details,출구 인터뷰의 자세한 사항,
-Held On,개최,
-Reason for Resignation,사임 이유,
-Better Prospects,더 나은 전망,
-Health Concerns,건강 문제,
 New Workplace,새로운 직장,
 HR-EAD-.YYYY.-,HR-EAD- .YYYY.-,
 Returned Amount,반품 금액,
@@ -8239,9 +8223,6 @@
 Manufacturers used in Items,항목에 사용 제조 업체,
 Limited to 12 characters,12 자로 제한,
 MAT-MR-.YYYY.-,매트 - MR - .YYYY.-,
-Set Warehouse,창고 설정,
-Sets 'For Warehouse' in each row of the Items table.,Items 테이블의 각 행에 &#39;For Warehouse&#39;를 설정합니다.,
-Requested For,에 대해 요청,
 Partially Ordered,부분적으로 주문 됨,
 Transferred,이전 됨,
 % Ordered,% 발주,
@@ -8690,8 +8671,6 @@
 Select warehouse for material requests,자재 요청을위한 창고 선택,
 Transfer Materials For Warehouse {0},창고 {0}의 자재 전송,
 Production Plan Material Request Warehouse,생산 계획 자재 요청 창고,
-Set From Warehouse,창고에서 설정,
-Source Warehouse (Material Transfer),출처 창고 (자재 이전),
 Sets 'Source Warehouse' in each row of the items table.,항목 테이블의 각 행에 &#39;소스 창고&#39;를 설정합니다.,
 Sets 'Target Warehouse' in each row of the items table.,항목 테이블의 각 행에 &#39;대상 창고&#39;를 설정합니다.,
 Show Cancelled Entries,취소 된 항목 표시,
@@ -9157,7 +9136,6 @@
 Is Income Tax Component,소득세 구성 요소,
 Component properties and references ,구성 요소 속성 및 참조,
 Additional Salary ,추가 급여,
-Condtion and formula,조건 및 공식,
 Unmarked days,표시되지 않은 날짜,
 Absent Days,결석 일,
 Conditions and Formula variable and example,조건 및 수식 변수 및 예,
@@ -9444,7 +9422,6 @@
 Please check your Plaid client ID and secret values,Plaid 클라이언트 ID와 비밀 값을 확인하세요.,
 Bank transaction creation error,은행 거래 생성 오류,
 Unit of Measurement,측정 단위,
-Row #{}: Selling rate for item {} is lower than its {}. Selling rate should be atleast {},행 # {} : 항목 {}의 판매율이 {}보다 낮습니다. 판매율은 {} 이상이어야합니다.,
 Fiscal Year {0} Does Not Exist,회계 연도 {0}이 (가) 존재하지 않음,
 Row # {0}: Returned Item {1} does not exist in {2} {3},행 # {0} : 반품 된 항목 {1}이 {2} {3}에 없습니다.,
 Valuation type charges can not be marked as Inclusive,평가 유형 요금은 포함으로 표시 할 수 없습니다.,
@@ -9598,8 +9575,60 @@
 Response Time for {0} priority in row {1} can't be greater than Resolution Time.,{1} 행의 {0} 우선 순위에 대한 응답 시간은 해결 시간보다 클 수 없습니다.,
 {0} is not enabled in {1},{0}은 (는) {1}에서 사용할 수 없습니다.,
 Group by Material Request,자재 요청별로 그룹화,
-"Row {0}: For Supplier {0}, Email Address is Required to Send Email",{0} 행 : 공급 업체 {0}의 경우 이메일을 보내려면 이메일 주소가 필요합니다.,
 Email Sent to Supplier {0},공급 업체 {0}에 이메일을 보냈습니다.,
 "The Access to Request for Quotation From Portal is Disabled. To Allow Access, Enable it in Portal Settings.",포털에서 견적 요청에 대한 액세스가 비활성화되었습니다. 액세스를 허용하려면 포털 설정에서 활성화하십시오.,
 Supplier Quotation {0} Created,공급 업체 견적 {0} 생성됨,
 Valid till Date cannot be before Transaction Date,유효 종료 날짜는 거래 날짜 이전 일 수 없습니다.,
+Unlink Advance Payment on Cancellation of Order,주문 취소시 선지급 연결 해제,
+"Simple Python Expression, Example: territory != 'All Territories'","간단한 Python 표현식, 예 : 지역! = &#39;모든 지역&#39;",
+Sales Contributions and Incentives,판매 기여 및 인센티브,
+Sourced by Supplier,공급자에 의해 공급,
+Total weightage assigned should be 100%.<br>It is {0},할당 된 총 가중치는 100 % 여야합니다.<br> {0}입니다,
+Account {0} exists in parent company {1}.,{0} 계정이 모회사 {1}에 있습니다.,
+"To overrule this, enable '{0}' in company {1}",이를 무시하려면 {1} 회사에서 &#39;{0}&#39;을 (를) 활성화하십시오.,
+Invalid condition expression,잘못된 조건식,
+Please Select a Company First,먼저 회사를 선택하십시오,
+Please Select Both Company and Party Type First,먼저 회사 및 당사자 유형을 모두 선택하십시오.,
+Provide the invoice portion in percent,송장 부분을 백분율로 제공,
+Give number of days according to prior selection,사전 선택에 따라 일수 제공,
+Email Details,이메일 세부 정보,
+"Select a greeting for the receiver. E.g. Mr., Ms., etc.","수신자를위한 인사말을 선택하십시오. 예 : Mr., Ms. 등",
+Preview Email,이메일 미리보기,
+Please select a Supplier,공급자를 선택하십시오,
+Supplier Lead Time (days),공급 업체 리드 타임 (일),
+"Home, Work, etc.","집, 직장 등",
+Exit Interview Held On,보류 된 인터뷰 종료,
+Condition and formula,조건 및 공식,
+Sets 'Target Warehouse' in each row of the Items table.,Items 테이블의 각 행에 &#39;Target Warehouse&#39;를 설정합니다.,
+Sets 'Source Warehouse' in each row of the Items table.,Items 테이블의 각 행에 &#39;Source Warehouse&#39;를 설정합니다.,
+POS Register,POS 등록,
+"Can not filter based on POS Profile, if grouped by POS Profile",POS 프로필로 그룹화 된 경우 POS 프로필을 기준으로 필터링 할 수 없습니다.,
+"Can not filter based on Customer, if grouped by Customer",고객별로 그룹화 된 경우 고객을 기준으로 필터링 할 수 없습니다.,
+"Can not filter based on Cashier, if grouped by Cashier",계산원별로 그룹화 된 경우 계산원을 기준으로 필터링 할 수 없습니다.,
+Payment Method,결제 방법,
+"Can not filter based on Payment Method, if grouped by Payment Method",결제 수단별로 그룹화 한 경우 결제 수단을 기준으로 필터링 할 수 없습니다.,
+Supplier Quotation Comparison,공급 업체 견적 비교,
+Price per Unit (Stock UOM),단가 (재고 UOM),
+Group by Supplier,공급 업체별 그룹화,
+Group by Item,항목 별 그룹화,
+Remember to set {field_label}. It is required by {regulation}.,{field_label}을 설정해야합니다. {regulation}에서 요구합니다.,
+Enrollment Date cannot be before the Start Date of the Academic Year {0},등록일은 학년도 {0}의 시작일 이전 일 수 없습니다.,
+Enrollment Date cannot be after the End Date of the Academic Term {0},등록일은 학기 종료일 {0} 이후 일 수 없습니다.,
+Enrollment Date cannot be before the Start Date of the Academic Term {0},등록일은 학기 시작일 {0} 이전 일 수 없습니다.,
+Posting future transactions are not allowed due to Immutable Ledger,불변 원장으로 인해 미래 거래를 게시 할 수 없습니다.,
+Future Posting Not Allowed,향후 전기가 허용되지 않음,
+"To enable Capital Work in Progress Accounting, ",자본 재공품 회계를 활성화하려면,
+you must select Capital Work in Progress Account in accounts table,계정 테이블에서 자본 진행중인 계정을 선택해야합니다.,
+You can also set default CWIP account in Company {},회사 {}에서 기본 CWIP 계정을 설정할 수도 있습니다.,
+The Request for Quotation can be accessed by clicking on the following button,견적 요청은 다음 버튼을 클릭하여 액세스 할 수 있습니다.,
+Regards,문안 인사,
+Please click on the following button to set your new password,새 비밀번호를 설정하려면 다음 버튼을 클릭하십시오.,
+Update Password,비밀번호 업데이트,
+Row #{}: Selling rate for item {} is lower than its {}. Selling {} should be atleast {},행 # {} : 항목 {}의 판매율이 {}보다 낮습니다. {} 판매는 {} 이상이어야합니다.,
+You can alternatively disable selling price validation in {} to bypass this validation.,또는 {}에서 판매 가격 검증을 비활성화하여이 검증을 우회 할 수 있습니다.,
+Invalid Selling Price,잘못된 판매 가격,
+Address needs to be linked to a Company. Please add a row for Company in the Links table.,주소는 회사에 연결되어야합니다. 링크 테이블에 회사 행을 추가하십시오.,
+Company Not Linked,연결되지 않은 회사,
+Import Chart of Accounts from CSV / Excel files,CSV / Excel 파일에서 계정과 목표 가져 오기,
+Completed Qty cannot be greater than 'Qty to Manufacture',완료된 수량은 &#39;제조 수량&#39;보다 클 수 없습니다.,
+"Row {0}: For Supplier {1}, Email Address is Required to send an email",{0} 행 : 공급 업체 {1}의 경우 이메일을 보내려면 이메일 주소가 필요합니다.,
diff --git a/erpnext/translations/ku.csv b/erpnext/translations/ku.csv
index 56be7a1..6c6282e 100644
--- a/erpnext/translations/ku.csv
+++ b/erpnext/translations/ku.csv
@@ -521,7 +521,6 @@
 Chargeble,Argearkbarî,
 Charges are updated in Purchase Receipt against each item,Li dijî wan doz bi wergirtina Purchase dijî hev babete ve,
 "Charges will be distributed proportionately based on item qty or amount, as per your selection","Li dijî wan doz dê were belavkirin bibihure li ser QTY babete an miqdar bingeha, wek per selection te",
-Chart Of Accounts,Chart Dageriyê,
 Chart of Cost Centers,Chart Navendên Cost,
 Check all,Check hemû,
 Checkout,Lêkolîn,
@@ -581,7 +580,6 @@
 Compensatory Off,heger Off,
 Compensatory leave request days not in valid holidays,Daxwaza berdêla dayîna mûçûna dermanê ne di nav betlanên derbasdar de ne,
 Complaint,Gilî,
-Completed Qty can not be greater than 'Qty to Manufacture',Qediya Qty ne dikarin bibin mezintir &#39;Qty ji bo Manufacture&#39;,
 Completion Date,Date cebîr,
 Computer,Komûter,
 Condition,Rewş,
@@ -2033,7 +2031,6 @@
 Please select Charge Type first,Ji kerema xwe ve yekem Charge Type hilbijêre,
 Please select Company,Ji kerema xwe ve Company hilbijêre,
 Please select Company and Designation,Ji kerema xwe şirket û şirove hilbijêrin,
-Please select Company and Party Type first,Ji kerema xwe ve yekem Company û Partiya Type hilbijêre,
 Please select Company and Posting Date to getting entries,Ji kerema xwe şîrket û Dîroka Navnîşê hilbijêre ku têkevin navnîşan,
 Please select Company first,Ji kerema xwe ve yekem Company hilbijêre,
 Please select Completion Date for Completed Asset Maintenance Log,Ji kerema xwe ji bo temamkirina Dîroka Dawîn hilbijêre Ji bo Endamiya Hêza Navîn ya Têketinê hilbijêre,
@@ -2980,7 +2977,6 @@
 The name of your company for which you are setting up this system.,The name of şirketa we ji bo ku hûn bi avakirina vê sîstemê.,
 The number of shares and the share numbers are inconsistent,Hejmarên parve û hejmarên parvekirî ne hevkar in,
 The payment gateway account in plan {0} is different from the payment gateway account in this payment request,Di plana navnîşan a daîreya navnîşan de {0} ji vê daxwazê deynê hesabê navnîşê ya ji derê ve ye,
-The request for quotation can be accessed by clicking on the following link,Daxwaz ji bo gotinên li dikare were bi tikandina li ser vê lînkê tê xwestin,
 The selected BOMs are not for the same item,The dikeye hilbijartî ne ji bo em babete eynî ne,
 The selected item cannot have Batch,The em babete kilîk ne dikarin Batch hene,
 The seller and the buyer cannot be the same,Pêwîstker û kirrûbir nabe,
@@ -3130,7 +3126,6 @@
 Total flexible benefit component amount {0} should not be less than max benefits {1},Hêjeya maddeya tevlîheviya neteweyî ya {0} divê bêtir xercên herî kêmtir tune {1},
 Total hours: {0},Total saetan: {0},
 Total leaves allocated is mandatory for Leave Type {0},Tevahiya pelên veguhestin divê ji cureyê derketinê {0},
-Total weightage assigned should be 100%. It is {0},Total weightage rêdan divê 100% be. Ev e {0},
 Total working hours should not be greater than max working hours {0},"Total dema xebatê ne, divê ji bilî dema xebatê max be mezintir {0}",
 Total {0} ({1}),Total {0} ({1}),
 "Total {0} for all items is zero, may be you should change 'Distribute Charges Based On'","Total {0} ji bo hemû tomar sifir e, dibe ku ji te re pêwîst &#39;Li dijî wan doz li ser xwer&#39;a&#39; biguhere",
@@ -3544,7 +3539,6 @@
 Company field is required,Qada pargîdaniyê pêdivî ye,
 Creating Dimensions...,Dimîne Afirandin ...,
 Duplicate entry against the item code {0} and manufacturer {1},Li dijî koda kodê {0} û hilberê {1},
-Import Chart Of Accounts from CSV / Excel files,Ji pelên CSV / Excel Pêkvekirina Hesabê Damezrînin,
 Invalid GSTIN! The input you've entered doesn't match the GSTIN format for UIN Holders or Non-Resident OIDAR Service Providers,GSTIN nederbasdar e! Navnîşa ku we têkevî bi formasyona GSTIN re ji bo Mêvanên UIN-ê an Niştecîhên Karûbarên OIDAR-yê Niştecîhan nabin,
 Invoice Grand Total,Pêşkêşiya Grand Total,
 Last carbon check date cannot be a future date,Dîroka kontrolkirina karbonê ya paşîn nikare tarîxek pêşerojê be,
@@ -3921,7 +3915,6 @@
 Plaid public token error,Errorewtiya nîşana gelemperî ya plaid,
 Plaid transactions sync error,Errorewtiya hevdemkirina transaksiyonên plaid,
 Please check the error log for details about the import errors,Ji kerema xwe hûrguliyên çewtiyê ji bo hûrguliyên li ser xeletiyên import kontrol bikin,
-Please click on the following link to set your new password,Ji kerema xwe li ser vê lînkê click to set şîfreya xwe ya nû,
 Please create <b>DATEV Settings</b> for Company <b>{}</b>.,Ji kerema <b>DATEV Mîhengên</b> ji bo Company <b>{}.</b>,
 Please create adjustment Journal Entry for amount {0} ,Ji kerema xwe amount 0},
 Please do not create more than 500 items at a time,Ji kerema xwe di yek carek de ji zêdeyî 500 hêsan neyên afirandin,
@@ -3997,6 +3990,7 @@
 Release date must be in the future,Dîroka berdanê divê di pêşerojê de be,
 Relieving Date must be greater than or equal to Date of Joining,Dîroka Baweriyê ji Dîroka Beşdariyê divê ji Mezin an Dîroka Beşdariyê mezintir be,
 Rename,Nav biguherîne,
+Rename Not Allowed,Navnedayin Nakokirin,
 Repayment Method is mandatory for term loans,Rêbaza vegerandina ji bo deynên termîn mecbûrî ye,
 Repayment Start Date is mandatory for term loans,Dîroka Ragihandina Dravê ji bo deynên termîn mecbûrî ye,
 Report Item,Report Babetê,
@@ -4043,7 +4037,6 @@
 Select All,Select All,
 Select Difference Account,Hesabê Cudahiyê hilbijêrin,
 Select a Default Priority.,Pêşerojek Default hilbijêrin.,
-Select a Supplier from the Default Supplier List of the items below.,Hilberînerek ji navnîşa Pargîdaniya Default ya tiştên li jêr hilbijêrin.,
 Select a company,Pargîdanek hilbijêrin,
 Select finance book for the item {0} at row {1},Ji bo tiştên finance 0} li rêza the 1 book pirtûka fînansê hilbijêrin,
 Select only one Priority as Default.,Tenê Pêşniyar wekî Yek Pêşek hilbijêrin.,
@@ -4247,7 +4240,6 @@
 Actual ,Rast,
 Add to cart,Têxe,
 Budget,Sermîyan,
-Chart Of Accounts Importer,Chart Of Accounts Importer,
 Chart of Accounts,Karta Karûbar,
 Customer database.,Database Database,
 Days Since Last order,Rojan de ji sala Last Order,
@@ -4546,7 +4538,6 @@
 Check Supplier Invoice Number Uniqueness,Check Supplier bi fatûreyên Hejmara bêhempabûna,
 Make Payment via Journal Entry,Make Payment via Peyam di Journal,
 Unlink Payment on Cancellation of Invoice,Unlink Payment li ser komcivîna me ya bi fatûreyên,
-Unlink Advance Payment on Cancelation of Order,Pêşniyara Dravê Daxistinê li ser Betalkirina Fermanê veqetîne,
 Book Asset Depreciation Entry Automatically,Book Asset Peyam Farhad otomatîk,
 Automatically Add Taxes and Charges from Item Tax Template,Ji Temablonê Bacê ya Bacê Bixwe bixwe baca û bacan zêde bikin,
 Automatically Fetch Payment Terms,Allyertên Dravê bixweber Bawer bikin,
@@ -4940,7 +4931,6 @@
 POS Customer Group,POS Mişterî Group,
 POS Field,POS Field,
 POS Item Group,POS babetî Pula,
-[Select],[Neqandin],
 Company Address,Company Address,
 Update Stock,update Stock,
 Ignore Pricing Rule,Guh Rule Pricing,
@@ -6481,7 +6471,6 @@
 Appraisal Template,appraisal Şablon,
 For Employee Name,Ji bo Name Xebatkara,
 Goals,armancên,
-Calculate Total Score,Calcolo Total Score,
 Total Score (Out of 5),Total Score: (Out of 5),
 "Any other remarks, noteworthy effort that should go in the records.","Bęjeyek ji axaftinên din jî, hewldana wê xalê de, ku divê di qeydên here.",
 Appraisal Goal,Goal appraisal,
@@ -6599,11 +6588,6 @@
 Reason for Leaving,Sedem ji bo Leaving,
 Leave Encashed?,Dev ji Encashed?,
 Encashment Date,Date Encashment,
-Exit Interview Details,Details Exit Hevpeyvîn,
-Held On,held ser,
-Reason for Resignation,Sedem ji bo îstîfakirinê,
-Better Prospects,baştir e,
-Health Concerns,Gûman Health,
 New Workplace,New Workplace,
 HR-EAD-.YYYY.-,HR-EAD-.YYYY-,
 Returned Amount,Dravê vegerandî,
@@ -8239,9 +8223,6 @@
 Manufacturers used in Items,"Manufacturers bikaranîn, di babetî",
 Limited to 12 characters,Bi sînor ji 12 tîpan,
 MAT-MR-.YYYY.-,MAT-MR-.YYYY-,
-Set Warehouse,Set Warehouse,
-Sets 'For Warehouse' in each row of the Items table.,Di her rêza maseya Tiştikan de &#39;Ji bo Warehouse&#39; saz dike.,
-Requested For,"xwestin, çimkî",
 Partially Ordered,Qismî Ferman,
 Transferred,veguhestin,
 % Ordered,% داواکراوە,
@@ -8690,8 +8671,6 @@
 Select warehouse for material requests,Ji bo daxwazên materyalê embarê hilbijêrin,
 Transfer Materials For Warehouse {0},Materyalên Veguhêzbar Ji bo Warehouse {0},
 Production Plan Material Request Warehouse,Plana Hilberînê Depoya Daxwaza Materyalê,
-Set From Warehouse,Ji Warehouse Saz Bike,
-Source Warehouse (Material Transfer),Depoya Çavkaniyê (Veguhestina Madeyê),
 Sets 'Source Warehouse' in each row of the items table.,Di her rêza maseya tiştan de &#39;Depoya Çavkaniyê&#39; saz dike.,
 Sets 'Target Warehouse' in each row of the items table.,Di her rêza maseya tiştan de &#39;Warehouse Target&#39; saz dike.,
 Show Cancelled Entries,Navnîşên Betalkirî Nîşan bidin,
@@ -9157,7 +9136,6 @@
 Is Income Tax Component,Pêkhateya Baca Dahatê ye,
 Component properties and references ,Taybetmendî û referansên pêkhateyê,
 Additional Salary ,Mûçeyê Zêdeyî,
-Condtion and formula,Tionert û formul,
 Unmarked days,Rojên nevekirî,
 Absent Days,Rojên Tunebûyî,
 Conditions and Formula variable and example,Itionsert û Formula guhêrbar û mînak,
@@ -9444,7 +9422,6 @@
 Please check your Plaid client ID and secret values,Ji kerema xwe nasnameya xerîdarê Plaid û nirxên xweyên nepenî kontrol bikin,
 Bank transaction creation error,Çewtiya afirandina danûstendina bankê,
 Unit of Measurement,Yekeya Pîvandinê,
-Row #{}: Selling rate for item {} is lower than its {}. Selling rate should be atleast {},Rêzok # {}: Rêjeya firotanê ji bo hêmanê {} ji ya wê {} kêmtir e. Divê rêjeya firotanê herî kêm be {},
 Fiscal Year {0} Does Not Exist,Sala Darayî {0} Heye,
 Row # {0}: Returned Item {1} does not exist in {2} {3},Rêzeya # {0}: Tişta vegerandî {1} li {2} {3} tune,
 Valuation type charges can not be marked as Inclusive,Dozên celebê nirxandinê wekî Inclusive nayên nîşankirin,
@@ -9598,8 +9575,60 @@
 Response Time for {0} priority in row {1} can't be greater than Resolution Time.,Dema Bersivê ji bo {0} pêşanî di rêzê de {1} nikare ji Dema Biryarê mezintir be.,
 {0} is not enabled in {1},{0} di {1} de nayê çalakirin,
 Group by Material Request,Ji hêla Daxwaza Maddî ve kom,
-"Row {0}: For Supplier {0}, Email Address is Required to Send Email","Rêz {0}: Ji bo Pêşkêşker {0}, Ji bo Sendandina E-name Navnîşana E-nameyê Pêdivî ye",
 Email Sent to Supplier {0},E-name ji bo Pêşkêşker şandiye {0},
 "The Access to Request for Quotation From Portal is Disabled. To Allow Access, Enable it in Portal Settings.","Gihîştina Daxwaza Gotinê Ji Portalê Neçalak e. Ji bo Destûra Destûrê, Di Mîhengên Portalê de Vê çalak bikin.",
 Supplier Quotation {0} Created,Pêşniyara Pêşkêşker {0} Afirandî,
 Valid till Date cannot be before Transaction Date,Derbasdar heya Dîrok nikare li ber Dîroka Danûstandinê be,
+Unlink Advance Payment on Cancellation of Order,Li Ser Betalkirina Biryarê Destpêka Peredanê Veqetînin,
+"Simple Python Expression, Example: territory != 'All Territories'","Vegotina Python a Sade, Mînak: erd! = &#39;Hemî Ax&#39;",
+Sales Contributions and Incentives,Beşdariyên firotanê û teşwîqan,
+Sourced by Supplier,Çavkaniya Çavkaniyê,
+Total weightage assigned should be 100%.<br>It is {0},Giraniya tevahî ya hatî diyar kirin divê% 100 be.<br> Ew {0} e,
+Account {0} exists in parent company {1}.,Hesab {0} di pargîdaniya dêûbavan de heye {1}.,
+"To overrule this, enable '{0}' in company {1}","Ji bo binpêkirina vê yekê, &#39;{0}&#39; di pargîdaniyê de çalak bikin {1}",
+Invalid condition expression,Vegotina rewşa nederbasdar,
+Please Select a Company First,Ji kerema xwe Pêşîn Pargîdaniyek Hilbijêrin,
+Please Select Both Company and Party Type First,Ji kerema xwe Yekem Tîpa Pargîdanî û Partiyê Hilbijêrin,
+Provide the invoice portion in percent,Beşa fatureyê ji sedî peyda bikin,
+Give number of days according to prior selection,Li gorî hilbijartina pêşîn hejmarek rojan bidin,
+Email Details,Email Details,
+"Select a greeting for the receiver. E.g. Mr., Ms., etc.","Silavek ji bo wergir hilbijêrin. Mînak birêz, xanim û hwd.",
+Preview Email,Pêşdîtina E-nameyê,
+Please select a Supplier,Ji kerema xwe Pêşniyarek hilbijêrin,
+Supplier Lead Time (days),Demjimêrê Pêşkêşker (rojan),
+"Home, Work, etc.","Mal, Kar û hwd.",
+Exit Interview Held On,Derketin Hevpeyivîn Çêdibe,
+Condition and formula,Condert û formul,
+Sets 'Target Warehouse' in each row of the Items table.,Li her rêza maseya Tişkan &#39;Depoya Armanc&#39; danîne.,
+Sets 'Source Warehouse' in each row of the Items table.,Di her rêza maseya Tişkan de &#39;Depoya Çavkaniyê&#39; saz dike.,
+POS Register,POS Register,
+"Can not filter based on POS Profile, if grouped by POS Profile","Heke ji hêla Profîla POS-ê ve were komkirin, li gorî Profîla POS-ê parzûn nabe",
+"Can not filter based on Customer, if grouped by Customer","Heke ji hêla Xerîdar ve were kom kirin, nikare li ser bingeha Xerîdar parzûn bibe",
+"Can not filter based on Cashier, if grouped by Cashier",Heke ji hêla Xezîneyê ve were komkirin nikare li ser Bingeha Cezîrê fîltre bike,
+Payment Method,Rêbaza dayinê,
+"Can not filter based on Payment Method, if grouped by Payment Method","Heke li gorî Rêbaza Bidestpêkbûnê were komkirin, li gorî Rêbaza Dravkirinê nikare parzûn bibe",
+Supplier Quotation Comparison,Berawirdekirina Pêşkêşkerê Pêşkêşker,
+Price per Unit (Stock UOM),Bihayê yekeya (Stock UOM),
+Group by Supplier,Kom ji hêla Pargîdaniyê ve,
+Group by Item,Kom bi Babet,
+Remember to set {field_label}. It is required by {regulation}.,Bînin bîra xwe ku {zeviyê_ etîketê} danîn. Ew ji hêla {rêziknameyê} ve pêdivî ye.,
+Enrollment Date cannot be before the Start Date of the Academic Year {0},Dîroka Tomarbûnê nikare berî Dîroka Destpêka Sala Akademîk be {0},
+Enrollment Date cannot be after the End Date of the Academic Term {0},Dîroka Tomarbûnê nikare piştî Dîroka Dawiya Termê Akademîkî be {0},
+Enrollment Date cannot be before the Start Date of the Academic Term {0},Dîroka Tomarbûnê nikare berî Dîroka Destpêka Heyama Akademîk be {0},
+Posting future transactions are not allowed due to Immutable Ledger,Transactionsandina danûstandinên pêşerojê ji ber Ledger-a Guhestbar nayê destûr kirin,
+Future Posting Not Allowed,Ingandina Pêşerojê Destûr Nabe,
+"To enable Capital Work in Progress Accounting, ","Ji bo Di Karûbarê Pêşkeftinê de Karê Kapîtal çalak bike,",
+you must select Capital Work in Progress Account in accounts table,divê hûn li sermaseya hesaban Karê Sermiyan di Hesabê Pêşkeftinê de hilbijêrin,
+You can also set default CWIP account in Company {},Di heman demê de hûn dikarin li Pargîdaniyê hesabê pêşdibistana CWIP jî saz bikin {},
+The Request for Quotation can be accessed by clicking on the following button,Daxwaza Nirxandinê bi tikandina bişkoja jêrîn ve tête peyda kirin,
+Regards,Silav û rêz,
+Please click on the following button to set your new password,Ji kerema xwe bişkoja jêrîn bikirtînin da ku şîfreya xweya nû saz bikin,
+Update Password,Passwordîfreyê nûve bikin,
+Row #{}: Selling rate for item {} is lower than its {}. Selling {} should be atleast {},Rêzok # {}: Rêjeya firotanê ji bo hêmanê {} ji ya wê {} kêmtir e. Firotin {} divê herî kêm {},
+You can alternatively disable selling price validation in {} to bypass this validation.,Hûn dikarin bi alternatîfî pejirandina bihayê firotanê li {} betal bikin ku vê pejirandinê derbas bikin.,
+Invalid Selling Price,Bihayê Firotinê Neheq e,
+Address needs to be linked to a Company. Please add a row for Company in the Links table.,Navnîşan hewce ye ku bi Pargîdaniyek ve were girêdan. Ji kerema xwe rêzek ji bo Pargîdaniyê di tabloya Girêdanan de zêde bikin.,
+Company Not Linked,Companyirket Ne Girêdayî ye,
+Import Chart of Accounts from CSV / Excel files,Chart of Accounts ji pelên CSV / Excel Import bikin,
+Completed Qty cannot be greater than 'Qty to Manufacture',Qty-ya qediyayî ji &#39;Qty-ya Çêkirinê&#39; mezintir nabe,
+"Row {0}: For Supplier {1}, Email Address is Required to send an email","Rêz {0}: Ji bo Pêşkêşker {1}, Navnîşana E-nameyê Pêdivî ye ku e-nameyek bişîne",
diff --git a/erpnext/translations/lo.csv b/erpnext/translations/lo.csv
index a72a7cd..dc791fc 100644
--- a/erpnext/translations/lo.csv
+++ b/erpnext/translations/lo.csv
@@ -521,7 +521,6 @@
 Chargeble,ຮັບຜິດຊອບ,
 Charges are updated in Purchase Receipt against each item,ຄ່າບໍລິການມີການປັບປຸງໃນການຮັບຊື້ຕໍ່ແຕ່ລະລາຍການ,
 "Charges will be distributed proportionately based on item qty or amount, as per your selection","ຄ່າບໍລິການຈະໄດ້ຮັບການແຈກຢາຍໂດຍອີງທຽບໃນຈໍານວນລາຍການຫຼືຈໍານວນເງິນທີ່, ເປັນຕໍ່ການຄັດເລືອກຂອງ",
-Chart Of Accounts,ຕາຕະລາງຂອງການບັນຊີ,
 Chart of Cost Centers,ຕາຕະລາງຂອງສູນຕົ້ນທຶນ,
 Check all,ກວດເບິ່ງທັງຫມົດ,
 Checkout,ກວດເບິ່ງ,
@@ -581,7 +580,6 @@
 Compensatory Off,ການຊົດເຊີຍ Off,
 Compensatory leave request days not in valid holidays,ວັນທີ່ຕ້ອງການຄ່າຊົດເຊີຍບໍ່ແມ່ນວັນທີ່ຖືກຕ້ອງ,
 Complaint,ຄໍາຮ້ອງທຸກ,
-Completed Qty can not be greater than 'Qty to Manufacture',ສໍາເລັດຈໍານວນບໍ່ສາມາດຈະມີຫຼາຍຂຶ້ນກ່ວາ &#39;ຈໍານວນການຜະລິດ&#39;,
 Completion Date,ວັນທີ່ສະຫມັກສໍາເລັດ,
 Computer,ຄອມພິວເຕີ,
 Condition,ສະພາບ,
@@ -2033,7 +2031,6 @@
 Please select Charge Type first,ກະລຸນາເລືອກປະເພດຄ່າໃຊ້ຈ່າຍຄັ້ງທໍາອິດ,
 Please select Company,ກະລຸນາເລືອກບໍລິສັດ,
 Please select Company and Designation,ກະລຸນາເລືອກບໍລິສັດແລະການອອກແບບ,
-Please select Company and Party Type first,ກະລຸນາເລືອກບໍລິສັດແລະພັກປະເພດທໍາອິດ,
 Please select Company and Posting Date to getting entries,ກະລຸນາເລືອກບໍລິສັດແລະວັນທີການລົງທືນເພື່ອຮັບເອົາລາຍການ,
 Please select Company first,ກະລຸນາເລືອກບໍລິສັດທໍາອິດ,
 Please select Completion Date for Completed Asset Maintenance Log,ກະລຸນາເລືອກວັນສໍາເລັດສໍາລັບບັນທຶກການບໍາລຸງຮັກສາທີ່ສົມບູນແລ້ວ,
@@ -2980,7 +2977,6 @@
 The name of your company for which you are setting up this system.,ຊື່ຂອງບໍລິສັດຂອງທ່ານສໍາລັບການທີ່ທ່ານຈະຕິດຕັ້ງລະບົບນີ້.,
 The number of shares and the share numbers are inconsistent,ຈໍານວນຮຸ້ນແລະຈໍານວນຮຸ້ນແມ່ນບໍ່ສອດຄ່ອງກັນ,
 The payment gateway account in plan {0} is different from the payment gateway account in this payment request,ບັນຊີປະຕູຜ່ານການຈ່າຍເງິນໃນແຜນ {0} ແມ່ນແຕກຕ່າງກັນຈາກບັນຊີປະຕູຜ່ານການຊໍາລະເງິນໃນຄໍາຮ້ອງຂໍການຊໍາລະເງິນນີ້,
-The request for quotation can be accessed by clicking on the following link,ການຮ້ອງຂໍສໍາລັບວົງຢືມສາມາດໄດ້ຮັບການເຂົ້າເຖິງໄດ້ໂດຍການຄລິກໃສ່ການເຊື່ອມຕໍ່ດັ່ງຕໍ່ໄປນີ້,
 The selected BOMs are not for the same item,ໄດ້ແອບເປີ້ນເລືອກບໍ່ໄດ້ສໍາລັບການບໍ່ວ່າຈະເປັນ,
 The selected item cannot have Batch,ການລາຍການທີ່ເລືອກບໍ່ສາມາດມີ Batch,
 The seller and the buyer cannot be the same,ຜູ້ຂາຍແລະຜູ້ຊື້ບໍ່ສາມາດດຽວກັນ,
@@ -3130,7 +3126,6 @@
 Total flexible benefit component amount {0} should not be less than max benefits {1},ຈຳ ນວນສ່ວນປະກອບການຊ່ວຍເຫຼືອທີ່ປ່ຽນແປງໄດ້ທັງ ໝົດ {0} ບໍ່ຄວນຈະ ໜ້ອຍ ກວ່າຜົນປະໂຫຍດສູງສຸດ {1},
 Total hours: {0},ຊົ່ວໂມງທັງຫມົດ: {0},
 Total leaves allocated is mandatory for Leave Type {0},ໃບທັງຫມົດທີ່ຖືກຈັດສັນແມ່ນບັງຄັບໃຫ້ປ່ອຍປະເພດ {0},
-Total weightage assigned should be 100%. It is {0},weightage ທັງຫມົດໄດ້ຮັບມອບຫມາຍຄວນຈະເປັນ 100%. ມັນເປັນ {0},
 Total working hours should not be greater than max working hours {0},ຊົ່ວໂມງການເຮັດວຽກທັງຫມົດບໍ່ຄວນຈະມີຫຼາຍກ່ວາຊົ່ວໂມງເຮັດວຽກສູງສຸດ {0},
 Total {0} ({1}),ທັງຫມົດ {0} ({1}),
 "Total {0} for all items is zero, may be you should change 'Distribute Charges Based On'",ທັງຫມົດ {0} ສໍາລັບລາຍການທັງຫມົດເປັນສູນອາດຈະເປັນທີ່ທ່ານຄວນຈະມີການປ່ຽນແປງ &#39;ແຈກຢາຍຄ່າບໍລິການຂຶ້ນຢູ່ກັບ&#39;,
@@ -3544,7 +3539,6 @@
 Company field is required,ຕ້ອງມີພາກສະ ໜາມ ຂອງບໍລິສັດ,
 Creating Dimensions...,ກຳ ລັງສ້າງຂະ ໜາດ ...,
 Duplicate entry against the item code {0} and manufacturer {1},ການປ້ອນຂໍ້ມູນຊ້ ຳ ກັບລະຫັດສິນຄ້າ {0} ແລະຜູ້ຜະລິດ {1},
-Import Chart Of Accounts from CSV / Excel files,ນຳ ເຂົ້າ Chart Of Accounts ຈາກ CSV / Excel files,
 Invalid GSTIN! The input you've entered doesn't match the GSTIN format for UIN Holders or Non-Resident OIDAR Service Providers,GSTIN ບໍ່ຖືກຕ້ອງ! ວັດສະດຸປ້ອນທີ່ທ່ານໄດ້ໃສ່ບໍ່ກົງກັບຮູບແບບ GSTIN ສຳ ລັບຜູ້ໃຫ້ບໍລິການ UIN ຫຼືຜູ້ໃຫ້ບໍລິການທີ່ບໍ່ແມ່ນຜູ້ຢູ່ອາໃສ,
 Invoice Grand Total,ໃບເກັບເງິນ Grand Total,
 Last carbon check date cannot be a future date,ວັນທີກວດກາຄາບອນສຸດທ້າຍບໍ່ສາມາດເປັນວັນທີໃນອະນາຄົດ,
@@ -3921,7 +3915,6 @@
 Plaid public token error,ຂໍ້ຜິດພາດ token ສາທາລະນະ Plaid,
 Plaid transactions sync error,ຂໍ້ຜິດພາດຂອງການເຮັດທຸລະ ກຳ ແບບ Plaid,
 Please check the error log for details about the import errors,ກະລຸນາກວດເບິ່ງຂໍ້ມູນບັນທຶກຂໍ້ຜິດພາດກ່ຽວກັບຂໍ້ຜິດພາດຂອງການ ນຳ ເຂົ້າ,
-Please click on the following link to set your new password,ກະລຸນາຄລິກໃສ່ການເຊື່ອມຕໍ່ດັ່ງຕໍ່ໄປນີ້ການຕັ້ງລະຫັດຜ່ານໃຫມ່ຂອງທ່ານ,
 Please create <b>DATEV Settings</b> for Company <b>{}</b>.,ກະລຸນາສ້າງ <b>ການຕັ້ງຄ່າ DATEV</b> ສຳ ລັບບໍລິສັດ <b>{}</b> .,
 Please create adjustment Journal Entry for amount {0} ,ກະລຸນາສ້າງການປັບການເຂົ້າວາລະສານ ສຳ ລັບ ຈຳ ນວນເງິນ {0},
 Please do not create more than 500 items at a time,ກະລຸນາຢ່າສ້າງຫຼາຍກວ່າ 500 ລາຍການໃນຄັ້ງດຽວ,
@@ -3997,6 +3990,7 @@
 Release date must be in the future,ວັນທີປ່ອຍຕ້ອງຢູ່ໃນອະນາຄົດ,
 Relieving Date must be greater than or equal to Date of Joining,ວັນທີຜ່ອນຄາຍຕ້ອງມີຂະ ໜາດ ໃຫຍ່ກວ່າຫຼືເທົ່າກັບວັນເຂົ້າຮ່ວມ,
 Rename,ປ່ຽນຊື່,
+Rename Not Allowed,ປ່ຽນຊື່ບໍ່ອະນຸຍາດ,
 Repayment Method is mandatory for term loans,ວິທີການຈ່າຍຄືນແມ່ນ ຈຳ ເປັນ ສຳ ລັບການກູ້ຢືມໄລຍະ,
 Repayment Start Date is mandatory for term loans,ວັນທີເລີ່ມຕົ້ນການຈ່າຍຄືນແມ່ນ ຈຳ ເປັນ ສຳ ລັບການກູ້ຢືມໄລຍະ,
 Report Item,ລາຍງານລາຍການ,
@@ -4043,7 +4037,6 @@
 Select All,ເລືອກທັງຫມົດ,
 Select Difference Account,ເລືອກບັນຊີຄວາມແຕກຕ່າງ,
 Select a Default Priority.,ເລືອກບູລິມະສິດ Default.,
-Select a Supplier from the Default Supplier List of the items below.,ເລືອກຜູ້ສະ ໜອງ ສິນຄ້າຈາກບັນຊີລາຍຊື່ຜູ້ສະ ໜອງ ສິນຄ້າໃນເບື້ອງຕົ້ນຂອງລາຍການຂ້າງລຸ່ມນີ້.,
 Select a company,ເລືອກບໍລິສັດ,
 Select finance book for the item {0} at row {1},ເລືອກປື້ມການເງິນ ສຳ ລັບລາຍການ {0} ຢູ່ແຖວ {1},
 Select only one Priority as Default.,ເລືອກເອົາ ໜຶ່ງ ສິ່ງບູລິມະສິດເປັນຄ່າເລີ່ມຕົ້ນ.,
@@ -4247,7 +4240,6 @@
 Actual ,ທີ່ແທ້ຈິງ,
 Add to cart,ຕື່ມການກັບໂຄງຮ່າງການ,
 Budget,ງົບປະມານ,
-Chart Of Accounts Importer,ຜູ້ ນຳ ເຂົ້າບັນຊີ,
 Chart of Accounts,Chart Of Accounts,
 Customer database.,ຖານຂໍ້ມູນລູກຄ້າ.,
 Days Since Last order,ວັນນັບຕັ້ງແຕ່ສັ່ງຫຼ້າສຸດ,
@@ -4546,7 +4538,6 @@
 Check Supplier Invoice Number Uniqueness,ການກວດສອບຜະລິດ Invoice ຈໍານວນເປັນເອກະລັກ,
 Make Payment via Journal Entry,ເຮັດໃຫ້ການຊໍາລະເງິນໂດຍຜ່ານການອະນຸທິນ,
 Unlink Payment on Cancellation of Invoice,Unlink ການຊໍາລະເງິນກ່ຽວກັບການຍົກເລີກການໃບເກັບເງິນ,
-Unlink Advance Payment on Cancelation of Order,ຍົກເລີກການຈ່າຍລ່ວງ ໜ້າ ກ່ຽວກັບການຍົກເລີກການສັ່ງຊື້,
 Book Asset Depreciation Entry Automatically,ປື້ມບັນ Asset Entry ຄ່າເສື່ອມລາຄາອັດຕະໂນມັດ,
 Automatically Add Taxes and Charges from Item Tax Template,ເພີ່ມພາສີແລະຄ່າບໍລິການໂດຍອັດຕະໂນມັດຈາກແມ່ແບບລາຍການພາສີ,
 Automatically Fetch Payment Terms,ດຶງຂໍ້ມູນເງື່ອນໄຂການຈ່າຍເງິນໂດຍອັດຕະໂນມັດ,
@@ -4940,7 +4931,6 @@
 POS Customer Group,POS ກຸ່ມລູກຄ້າ,
 POS Field,POS Field,
 POS Item Group,ກຸ່ມສິນຄ້າ POS,
-[Select],[ເລືອກ],
 Company Address,ທີ່ຢູ່ບໍລິສັດ,
 Update Stock,ຫລັກຊັບ,
 Ignore Pricing Rule,ບໍ່ສົນໃຈກົດລະບຽບການຕັ້ງລາຄາ,
@@ -6481,7 +6471,6 @@
 Appraisal Template,ແມ່ແບບການປະເມີນຜົນ,
 For Employee Name,ສໍາລັບຊື່ຂອງພະນັກງານ,
 Goals,ເປົ້າຫມາຍ,
-Calculate Total Score,ຄິດໄລ່ຄະແນນທັງຫມົດ,
 Total Score (Out of 5),ຄະແນນທັງຫມົດ (Out of 5),
 "Any other remarks, noteworthy effort that should go in the records.","ໃດຂໍ້ສັງເກດອື່ນໆ, ຄວາມພະຍາຍາມສັງເກດວ່າຄວນຈະຢູ່ໃນບັນທຶກດັ່ງກ່າວ.",
 Appraisal Goal,ການປະເມີນຜົນເປົ້າຫມາຍ,
@@ -6599,11 +6588,6 @@
 Reason for Leaving,ເຫດຜົນສໍາລັບການຊຶ່ງເຮັດໃຫ້,
 Leave Encashed?,ອອກຈາກ Encashed?,
 Encashment Date,ວັນທີ່ສະຫມັກ Encashment,
-Exit Interview Details,ລາຍລະອຽດການທ່ອງທ່ຽວສໍາພາດ,
-Held On,ຈັດຂຶ້ນໃນວັນກ່ຽວກັບ,
-Reason for Resignation,ເຫດຜົນສໍາລັບການລາອອກ,
-Better Prospects,ອະນາຄົດທີ່ດີກວ່າ,
-Health Concerns,ຄວາມກັງວົນສຸຂະພາບ,
 New Workplace,ຖານທີ່ເຮັດວຽກໃຫມ່,
 HR-EAD-.YYYY.-,HR-EAD-.YYYY.-,
 Returned Amount,ຈຳ ນວນເງິນທີ່ສົ່ງຄືນ,
@@ -8239,9 +8223,6 @@
 Manufacturers used in Items,ຜູ້ຜະລິດນໍາໃຊ້ໃນການ,
 Limited to 12 characters,ຈໍາກັດເຖິງ 12 ລັກສະນະ,
 MAT-MR-.YYYY.-,MAT-MR-.YYYY.-,
-Set Warehouse,ຕັ້ງສາງ,
-Sets 'For Warehouse' in each row of the Items table.,ຕັ້ງ &#39;ສຳ ລັບສາງ&#39; ໃນແຕ່ລະແຖວຂອງຕາຕະລາງສິນຄ້າ.,
-Requested For,ຕ້ອງການສໍາລັບ,
 Partially Ordered,ສັ່ງບາງສ່ວນ,
 Transferred,ໂອນ,
 % Ordered,% ຄໍາສັ່ງ,
@@ -8690,8 +8671,6 @@
 Select warehouse for material requests,ເລືອກສາງ ສຳ ລັບການຮ້ອງຂໍດ້ານວັດຖຸ,
 Transfer Materials For Warehouse {0},ໂອນວັດສະດຸ ສຳ ລັບສາງ {0},
 Production Plan Material Request Warehouse,ການຂໍອຸປະກອນການວາງແຜນການຜະລິດສາງ,
-Set From Warehouse,ຕັ້ງຈາກສາງ,
-Source Warehouse (Material Transfer),ສາງແຫຼ່ງຂໍ້ມູນ (ໂອນຍ້າຍວັດສະດຸ),
 Sets 'Source Warehouse' in each row of the items table.,ຕັ້ງ &#39;ສາງແຫຼ່ງຂໍ້ມູນ&#39; ໃນແຕ່ລະແຖວຂອງຕາຕະລາງສິນຄ້າ.,
 Sets 'Target Warehouse' in each row of the items table.,ຕັ້ງ &#39;ສາງເປົ້າ ໝາຍ&#39; ໃນແຕ່ລະແຖວຂອງຕາຕະລາງ.,
 Show Cancelled Entries,ສະແດງລາຍການທີ່ຖືກຍົກເລີກ,
@@ -9157,7 +9136,6 @@
 Is Income Tax Component,ແມ່ນສ່ວນປະກອບອາກອນລາຍໄດ້,
 Component properties and references ,ຄຸນສົມບັດແລະເອກະສານອ້າງອິງ,
 Additional Salary ,ເງິນເດືອນເພີ່ມ,
-Condtion and formula,ເງື່ອນໄຂແລະສູດ,
 Unmarked days,ມື້ທີ່ບໍ່ໄດ້ ໝາຍ,
 Absent Days,ວັນຂາດ,
 Conditions and Formula variable and example,ເງື່ອນໄຂແລະຕົວປ່ຽນແປງສູດແລະຕົວຢ່າງ,
@@ -9444,7 +9422,6 @@
 Please check your Plaid client ID and secret values,ກະລຸນາກວດເບິ່ງ ID ຂອງລູກຄ້າ Plaid ແລະຄຸນຄ່າລັບ,
 Bank transaction creation error,ຂໍ້ຜິດພາດໃນການສ້າງທຸລະ ກຳ ຂອງທະນາຄານ,
 Unit of Measurement,ຫົວ ໜ່ວຍ ວັດແທກ,
-Row #{}: Selling rate for item {} is lower than its {}. Selling rate should be atleast {},ແຖວ # {}: ອັດຕາການຂາຍ ສຳ ລັບລາຍການ {} ແມ່ນຕໍ່າກວ່າ {} ຂອງມັນ. ອັດຕາການຂາຍຄວນຈະເປັນອັນດັບ {},
 Fiscal Year {0} Does Not Exist,ປີງົບປະມານ {0} ບໍ່ມີ,
 Row # {0}: Returned Item {1} does not exist in {2} {3},ແຖວ # {0}: ສິນຄ້າທີ່ໄດ້ກັບມາ {1} ບໍ່ມີຢູ່ໃນ {2} {3},
 Valuation type charges can not be marked as Inclusive,ຄ່າບໍລິການປະເພດການປະເມີນມູນຄ່າບໍ່ສາມາດຖືກ ໝາຍ ວ່າລວມ,
@@ -9598,8 +9575,60 @@
 Response Time for {0} priority in row {1} can't be greater than Resolution Time.,ເວລາຕອບໂຕ້ ສຳ ລັບ {0} ບູລິມະສິດໃນແຖວ {1} ບໍ່ສາມາດໃຫຍ່ກວ່າເວລາ Resolution (Resolution Time).,
 {0} is not enabled in {1},{0} ບໍ່ໄດ້ເປີດໃຊ້ໃນ {1},
 Group by Material Request,ຈັດກຸ່ມໂດຍການຮ້ອງຂໍເອກະສານ,
-"Row {0}: For Supplier {0}, Email Address is Required to Send Email","ແຖວ {0}: ສຳ ລັບຜູ້ສະ ໜອງ {0}, ທີ່ຢູ່ອີເມວ ຈຳ ເປັນຕ້ອງສົ່ງອີເມວ",
 Email Sent to Supplier {0},ສົ່ງອີເມວໄປຫາຜູ້ສະ ໜອງ {0},
 "The Access to Request for Quotation From Portal is Disabled. To Allow Access, Enable it in Portal Settings.","ການເຂົ້າເຖິງການຂໍເອົາວົງຢືມຈາກປະຕູແມ່ນຖືກປິດໃຊ້ງານ. ເພື່ອອະນຸຍາດໃຫ້ເຂົ້າເຖິງ, ເປີດໃຊ້ມັນຢູ່ໃນ Portal Settings.",
 Supplier Quotation {0} Created,ວົງຢືມຜູ້ສະ ໜອງ {0} ສ້າງຂື້ນມາ,
 Valid till Date cannot be before Transaction Date,ຖືກຕ້ອງຈົນເຖິງວັນທີບໍ່ສາມາດກ່ອນວັນທີທຸລະ ກຳ,
+Unlink Advance Payment on Cancellation of Order,ຍົກເລີກການຈ່າຍເງິນລ່ວງ ໜ້າ ກ່ຽວກັບການຍົກເລີກການສັ່ງຊື້,
+"Simple Python Expression, Example: territory != 'All Territories'","ການສະແດງອອກ Python ແບບງ່າຍດາຍ, ຕົວຢ່າງ: ອານາເຂດ! = &#39;ອານາເຂດທັງ ໝົດ&#39;",
+Sales Contributions and Incentives,ການປະກອບສ່ວນການຂາຍແລະແຮງຈູງໃຈ,
+Sourced by Supplier,ສະ ໜັບ ສະ ໜູນ ໂດຍຜູ້ສະ ໜອງ ສິນຄ້າ,
+Total weightage assigned should be 100%.<br>It is {0},ນ້ ຳ ໜັກ ທັງ ໝົດ ທີ່ມອບ ໝາຍ ໃຫ້ແມ່ນ 100%.<br> ມັນແມ່ນ {0},
+Account {0} exists in parent company {1}.,ບັນຊີ {0} ມີຢູ່ໃນບໍລິສັດແມ່ {1}.,
+"To overrule this, enable '{0}' in company {1}","ເພື່ອລົບລ້າງສິ່ງນີ້, ເປີດໃຊ້ &#39;{0}&#39; ໃນບໍລິສັດ {1}",
+Invalid condition expression,ການສະແດງອອກເງື່ອນໄຂທີ່ບໍ່ຖືກຕ້ອງ,
+Please Select a Company First,ກະລຸນາເລືອກບໍລິສັດກ່ອນ,
+Please Select Both Company and Party Type First,ກະລຸນາເລືອກເອົາທັງບໍລິສັດແລະປະເພດພັກກ່ອນ,
+Provide the invoice portion in percent,ໃຫ້ສ່ວນໃບເກັບເງິນເປັນເປີເຊັນ,
+Give number of days according to prior selection,ໃຫ້ ຈຳ ນວນມື້ຕາມການເລືອກກ່ອນ,
+Email Details,ລາຍລະອຽດອີເມວ,
+"Select a greeting for the receiver. E.g. Mr., Ms., etc.","ເລືອກ ຄຳ ທັກທາຍ ສຳ ລັບຜູ້ຮັບ. ຕົວຢ່າງທ່ານ, ນາງ, ແລະອື່ນໆ.",
+Preview Email,ເບິ່ງຕົວຢ່າງ Email,
+Please select a Supplier,ກະລຸນາເລືອກຜູ້ສະ ໜອງ,
+Supplier Lead Time (days),ເວລາ ນຳ ຂອງຜູ້ສະ ໜອງ (ມື້),
+"Home, Work, etc.","ເຮືອນ, ບ່ອນເຮັດວຽກ, ແລະອື່ນໆ",
+Exit Interview Held On,ການ ສຳ ພາດອອກໄດ້ຈັດຂຶ້ນ,
+Condition and formula,ເງື່ອນໄຂແລະສູດ,
+Sets 'Target Warehouse' in each row of the Items table.,ຕັ້ງ &#39;ສາງເປົ້າ ໝາຍ&#39; ໃນແຕ່ລະແຖວຂອງຕາຕະລາງສິນຄ້າ.,
+Sets 'Source Warehouse' in each row of the Items table.,ຕັ້ງ &#39;ສາງແຫຼ່ງຂໍ້ມູນ&#39; ໃນແຕ່ລະແຖວຂອງຕາຕະລາງສິນຄ້າ.,
+POS Register,POS ລົງທະບຽນ,
+"Can not filter based on POS Profile, if grouped by POS Profile","ບໍ່ສາມາດກັ່ນຕອງໄດ້ໂດຍອີງໃສ່ໂປແກຼມ POS, ຖ້າຈັດເປັນກຸ່ມໂດຍໂປຼໄຟລ໌ POS",
+"Can not filter based on Customer, if grouped by Customer","ບໍ່ສາມາດກັ່ນຕອງໂດຍອີງໃສ່ລູກຄ້າ, ຖ້າຈັດເປັນກຸ່ມໂດຍລູກຄ້າ",
+"Can not filter based on Cashier, if grouped by Cashier","ບໍ່ສາມາດກັ່ນຕອງໄດ້ໂດຍອີງໃສ່ Cashier, ຖ້າຈັດເປັນກຸ່ມໂດຍ Cashier",
+Payment Method,ວິທີການຈ່າຍເງິນ,
+"Can not filter based on Payment Method, if grouped by Payment Method","ບໍ່ສາມາດກັ່ນຕອງໂດຍອີງໃສ່ວິທີການຈ່າຍເງິນ, ຖ້າຈັດເປັນກຸ່ມດ້ວຍວິທີການຈ່າຍເງິນ",
+Supplier Quotation Comparison,ການປຽບທຽບວົງຢືມຂອງຜູ້ສະ ໜອງ,
+Price per Unit (Stock UOM),ລາຄາຕໍ່ ໜ່ວຍ (Stock UOM),
+Group by Supplier,ກຸ່ມໂດຍຜູ້ສະ ໜອງ,
+Group by Item,ກຸ່ມໂດຍລາຍການ,
+Remember to set {field_label}. It is required by {regulation}.,ຢ່າລືມຕັ້ງຄ່າ {field_label}. ມັນຖືກ ກຳ ນົດໂດຍ {ລະບຽບການ}.,
+Enrollment Date cannot be before the Start Date of the Academic Year {0},ວັນທີລົງທະບຽນບໍ່ສາມາດກ່ອນວັນເຂົ້າຮຽນຂອງປີການສຶກສາ {0},
+Enrollment Date cannot be after the End Date of the Academic Term {0},ວັນທີລົງທະບຽນບໍ່ໃຫ້ກາຍວັນສິ້ນສຸດໄລຍະການສຶກສາ {0},
+Enrollment Date cannot be before the Start Date of the Academic Term {0},ວັນທີລົງທະບຽນບໍ່ສາມາດກ່ອນວັນທີເລີ່ມການສຶກສາ {0},
+Posting future transactions are not allowed due to Immutable Ledger,ການປະກາດທຸລະ ກຳ ໃນອະນາຄົດແມ່ນບໍ່ໄດ້ຮັບອະນຸຍາດເນື່ອງຈາກ Immutable Ledger,
+Future Posting Not Allowed,ການປະກາດໃນອະນາຄົດບໍ່ໄດ້ຮັບອະນຸຍາດ,
+"To enable Capital Work in Progress Accounting, ","ເພື່ອເຮັດໃຫ້ນະຄອນຫຼວງເຮັດວຽກໃນຄວາມຄືບ ໜ້າ ໃນບັນຊີ,",
+you must select Capital Work in Progress Account in accounts table,ທ່ານຕ້ອງເລືອກບັນຊີ Capital Work in Progress Account ໃນຕາຕະລາງບັນຊີ,
+You can also set default CWIP account in Company {},ທ່ານຍັງສາມາດຕັ້ງຄ່າບັນຊີ CWIP ໃນບໍລິສັດ {},
+The Request for Quotation can be accessed by clicking on the following button,ຄຳ ຮ້ອງຂໍການສະ ເໜີ ລາຄາສາມາດເຂົ້າເບິ່ງໄດ້ໂດຍການກົດປຸ່ມຕໍ່ໄປນີ້,
+Regards,ກ່ຽວກັບ,
+Please click on the following button to set your new password,ກະລຸນາກົດປຸ່ມຕໍ່ໄປນີ້ເພື່ອຕັ້ງລະຫັດລັບ ໃໝ່ ຂອງທ່ານ,
+Update Password,ປັບປຸງລະຫັດຜ່ານ,
+Row #{}: Selling rate for item {} is lower than its {}. Selling {} should be atleast {},ແຖວ # {}: ອັດຕາການຂາຍ ສຳ ລັບລາຍການ {} ແມ່ນຕໍ່າກວ່າ {} ຂອງມັນ. ການຂາຍ {} ຄວນຈະເປັນອັນດັບ {},
+You can alternatively disable selling price validation in {} to bypass this validation.,ທ່ານສາມາດປິດການ ນຳ ໃຊ້ຄວາມຖືກຕ້ອງຂອງລາຄາໃນ {} ເພື່ອຫລີກລ້ຽງການຢືນຢັນນີ້.,
+Invalid Selling Price,ລາຄາຂາຍບໍ່ຖືກຕ້ອງ,
+Address needs to be linked to a Company. Please add a row for Company in the Links table.,ທີ່ຢູ່ຕ້ອງໄດ້ເຊື່ອມໂຍງກັບບໍລິສັດ. ກະລຸນາຕື່ມແຖວ ສຳ ລັບບໍລິສັດໃນຕາຕະລາງ Links.,
+Company Not Linked,ບໍລິສັດບໍ່ເຊື່ອມໂຍງ,
+Import Chart of Accounts from CSV / Excel files,ນຳ ເຂົ້າຕາຕະລາງບັນຊີຈາກໄຟລ໌ CSV / Excel,
+Completed Qty cannot be greater than 'Qty to Manufacture',Qty ສຳ ເລັດແລ້ວບໍ່ສາມາດໃຫຍ່ກວ່າ &#39;Qty to manufacture&#39;,
+"Row {0}: For Supplier {1}, Email Address is Required to send an email","ແຖວ {0}: ສຳ ລັບຜູ້ສະ ໜອງ {1}, ທີ່ຢູ່ອີເມວ ຈຳ ເປັນຕ້ອງສົ່ງອີເມວ",
diff --git a/erpnext/translations/lt.csv b/erpnext/translations/lt.csv
index cdcfe31..88520db 100644
--- a/erpnext/translations/lt.csv
+++ b/erpnext/translations/lt.csv
@@ -521,7 +521,6 @@
 Chargeble,Apmokestinamas,
 Charges are updated in Purchase Receipt against each item,Mokesčiai yra atnaujinama pirkimo kvitą su kiekvieno elemento,
 "Charges will be distributed proportionately based on item qty or amount, as per your selection","Mokesčiai bus platinamas proporcingai remiantis punktas Kiekis arba sumos, kaip už savo pasirinkimą",
-Chart Of Accounts,Sąskaitų planas,
 Chart of Cost Centers,Schema sąnaudų centrams,
 Check all,Viską Patikrink,
 Checkout,Užsakymas,
@@ -581,7 +580,6 @@
 Compensatory Off,kompensacinė Išjungtas,
 Compensatory leave request days not in valid holidays,Kompensuojamųjų atostogų prašymo dienos netaikomos galiojančiomis atostogomis,
 Complaint,Skundas,
-Completed Qty can not be greater than 'Qty to Manufacture',Užbaigtas Kiekis negali būti didesnis nei &quot;Kiekis iki Gamyba&quot;,
 Completion Date,užbaigimo data,
 Computer,Kompiuteris,
 Condition,būklė,
@@ -2033,7 +2031,6 @@
 Please select Charge Type first,Prašome pasirinkti mokesčių rūšis pirmą kartą,
 Please select Company,Prašome pasirinkti kompaniją,
 Please select Company and Designation,Pasirinkite bendrovę ir žymėjimą,
-Please select Company and Party Type first,Prašome pasirinkti bendrovė ir šalies tipo pirmas,
 Please select Company and Posting Date to getting entries,"Jei norite gauti įrašus, pasirinkite Įmonės ir paskelbimo datą",
 Please select Company first,Prašome pasirinkti Company pirmas,
 Please select Completion Date for Completed Asset Maintenance Log,Prašome pasirinkti baigtinio turto priežiūros žurnalo užbaigimo datą,
@@ -2980,7 +2977,6 @@
 The name of your company for which you are setting up this system.,"Jūsų įmonės pavadinimas, dėl kurių jūs nustatote šią sistemą.",
 The number of shares and the share numbers are inconsistent,Akcijų skaičius ir akcijų skaičius yra nenuoseklūs,
 The payment gateway account in plan {0} is different from the payment gateway account in this payment request,Plano {0} mokėjimo sąsajos sąskaita skiriasi nuo mokėjimo sąsajos sąskaitos šiame mokėjimo prašyme,
-The request for quotation can be accessed by clicking on the following link,Už citatos prašymas gali būti atvertas paspaudę šią nuorodą,
 The selected BOMs are not for the same item,Pasirinktos BOMs yra ne to paties objekto,
 The selected item cannot have Batch,Pasirinktas elementas negali turėti Serija,
 The seller and the buyer cannot be the same,Pardavėjas ir pirkėjas negali būti vienodi,
@@ -3130,7 +3126,6 @@
 Total flexible benefit component amount {0} should not be less than max benefits {1},Bendra lanksčios išmokos komponento suma {0} neturėtų būti mažesnė už maksimalią naudą {1},
 Total hours: {0},Iš viso valandų: {0},
 Total leaves allocated is mandatory for Leave Type {0},"Iš viso paskirtų lapų privaloma, jei paliekamas tipas {0}",
-Total weightage assigned should be 100%. It is {0},Iš viso weightage priskirti turi būti 100%. Ji yra {0},
 Total working hours should not be greater than max working hours {0},Iš viso darbo valandų turi būti ne didesnis nei maks darbo valandų {0},
 Total {0} ({1}),Viso {0} ({1}),
 "Total {0} for all items is zero, may be you should change 'Distribute Charges Based On'","Viso {0} visoms prekėms yra lygus nuliui, gali būti, jūs turėtumėte pakeisti &quot;Paskirstyti mokesčius pagal&quot;",
@@ -3544,7 +3539,6 @@
 Company field is required,Įmonės laukas yra būtinas,
 Creating Dimensions...,Kuriami aspektai ...,
 Duplicate entry against the item code {0} and manufacturer {1},Gaminio kodo {0} ir gamintojo {1} dublikatas,
-Import Chart Of Accounts from CSV / Excel files,Importuokite sąskaitų diagramą iš CSV / „Excel“ failų,
 Invalid GSTIN! The input you've entered doesn't match the GSTIN format for UIN Holders or Non-Resident OIDAR Service Providers,Neteisingas GSTIN! Jūsų įvestas įrašas neatitinka UIN turėtojų ar nerezidentų OIDAR paslaugų teikėjų GSTIN formato,
 Invoice Grand Total,Sąskaita faktūra iš viso,
 Last carbon check date cannot be a future date,Paskutinė anglies dioksido kiekio tikrinimo data negali būti būsima data,
@@ -3921,7 +3915,6 @@
 Plaid public token error,Akivaizdi viešojo ženklo klaida,
 Plaid transactions sync error,Paprastų operacijų sinchronizavimo klaida,
 Please check the error log for details about the import errors,"Patikrinkite klaidų žurnalą, kad gautumėte informacijos apie importavimo klaidas",
-Please click on the following link to set your new password,Spustelėkite šią nuorodą nustatyti naują slaptažodį,
 Please create <b>DATEV Settings</b> for Company <b>{}</b>.,Sukurkite <b>DATEV nustatymus</b> įmonei <b>{}</b> .,
 Please create adjustment Journal Entry for amount {0} ,Sukurkite {0} sumos koregavimo žurnalo įrašą,
 Please do not create more than 500 items at a time,Nesukurkite daugiau nei 500 daiktų vienu metu,
@@ -3997,6 +3990,7 @@
 Release date must be in the future,Išleidimo data turi būti ateityje,
 Relieving Date must be greater than or equal to Date of Joining,Atleidimo data turi būti didesnė arba lygi prisijungimo datai,
 Rename,pervadinti,
+Rename Not Allowed,Pervardyti neleidžiama,
 Repayment Method is mandatory for term loans,Grąžinimo būdas yra privalomas terminuotoms paskoloms,
 Repayment Start Date is mandatory for term loans,Grąžinimo pradžios data yra privaloma terminuotoms paskoloms,
 Report Item,Pranešti apie prekę,
@@ -4043,7 +4037,6 @@
 Select All,Pasirinkti viską,
 Select Difference Account,Pasirinkite skirtumų sąskaitą,
 Select a Default Priority.,Pasirinkite numatytąjį prioritetą.,
-Select a Supplier from the Default Supplier List of the items below.,"Iš tiekėjų, esančių žemiau esančiame prekių sąraše, pasirinkite tiekėją.",
 Select a company,Pasirinkite įmonę,
 Select finance book for the item {0} at row {1},Pasirinkite {0} eilutės {1} finansinę knygą,
 Select only one Priority as Default.,Pasirinkite tik vieną prioritetą kaip numatytąjį.,
@@ -4247,7 +4240,6 @@
 Actual ,faktinis,
 Add to cart,Į krepšelį,
 Budget,Biudžetas,
-Chart Of Accounts Importer,Sąskaitų diagrama,
 Chart of Accounts,Sąskaitų diagrama,
 Customer database.,Klientų duomenų bazė.,
 Days Since Last order,Dienos nuo paskutinio įsakymo,
@@ -4546,7 +4538,6 @@
 Check Supplier Invoice Number Uniqueness,Patikrinkite Tiekėjas sąskaitos faktūros numeris Unikalumas,
 Make Payment via Journal Entry,Atlikti mokėjimą per žurnalo įrašą,
 Unlink Payment on Cancellation of Invoice,Atsieti Apmokėjimas atšaukimas sąskaita faktūra,
-Unlink Advance Payment on Cancelation of Order,Atsiekite išankstinį mokėjimą už užsakymo atšaukimą,
 Book Asset Depreciation Entry Automatically,Užsakyti Turto nusidėvėjimas Įėjimas Automatiškai,
 Automatically Add Taxes and Charges from Item Tax Template,Automatiškai pridėti mokesčius ir rinkliavas iš elemento mokesčio šablono,
 Automatically Fetch Payment Terms,Automatiškai gauti mokėjimo sąlygas,
@@ -4940,7 +4931,6 @@
 POS Customer Group,POS Klientų grupė,
 POS Field,POS laukas,
 POS Item Group,POS punktas grupė,
-[Select],[Pasirinkti],
 Company Address,Kompanijos adresas,
 Update Stock,Atnaujinti sandėlyje,
 Ignore Pricing Rule,Ignoruoti kainodaros taisyklė,
@@ -6481,7 +6471,6 @@
 Appraisal Template,vertinimas Šablono,
 For Employee Name,Darbuotojo Vardas,
 Goals,Tikslai,
-Calculate Total Score,Apskaičiuokite bendras rezultatas,
 Total Score (Out of 5),Iš viso balas (iš 5),
 "Any other remarks, noteworthy effort that should go in the records.","Bet koks kitas pastabas, pažymėtina pastangų, kad reikia eiti į apskaitą.",
 Appraisal Goal,vertinimas tikslas,
@@ -6599,11 +6588,6 @@
 Reason for Leaving,Išvykimo priežastis,
 Leave Encashed?,Palikite Encashed?,
 Encashment Date,išgryninimo data,
-Exit Interview Details,Išeiti Interviu detalės,
-Held On,vyks,
-Reason for Resignation,"Priežastis, dėl atsistatydinimo",
-Better Prospects,Geresnės perspektyvos,
-Health Concerns,sveikatos problemas,
 New Workplace,nauja Darbo,
 HR-EAD-.YYYY.-,HR-EAD-.YYYY.-,
 Returned Amount,Grąžinta suma,
@@ -8239,9 +8223,6 @@
 Manufacturers used in Items,Gamintojai naudojami daiktai,
 Limited to 12 characters,Ribojamas iki 12 simbolių,
 MAT-MR-.YYYY.-,MAT-MR-.YYYY.-,
-Set Warehouse,Nustatyti sandėlį,
-Sets 'For Warehouse' in each row of the Items table.,Kiekvienoje lentelės Elementai eilutėje nustatomas „Sandėliui“.,
-Requested For,prašoma Dėl,
 Partially Ordered,Iš dalies užsakyta,
 Transferred,Perduotas,
 % Ordered,% Užsakytas,
@@ -8690,8 +8671,6 @@
 Select warehouse for material requests,Pasirinkite sandėlį medžiagų užklausoms,
 Transfer Materials For Warehouse {0},Sandėlio medžiagos perdavimas {0},
 Production Plan Material Request Warehouse,Gamybos plano medžiagų užklausų sandėlis,
-Set From Warehouse,Rinkinys iš sandėlio,
-Source Warehouse (Material Transfer),Šaltinio sandėlis (medžiagų perdavimas),
 Sets 'Source Warehouse' in each row of the items table.,Kiekvienoje elementų lentelės eilutėje nustatomas „Šaltinio sandėlis“.,
 Sets 'Target Warehouse' in each row of the items table.,Kiekvienoje elementų lentelės eilutėje nustatomas „Tikslinis sandėlis“.,
 Show Cancelled Entries,Rodyti atšauktus įrašus,
@@ -9157,7 +9136,6 @@
 Is Income Tax Component,Yra pajamų mokesčio komponentas,
 Component properties and references ,Komponento savybės ir nuorodos,
 Additional Salary ,Papildomas atlyginimas,
-Condtion and formula,Sąlyga ir formulė,
 Unmarked days,Nepažymėtos dienos,
 Absent Days,Nėra dienų,
 Conditions and Formula variable and example,Sąlygos ir formulės kintamasis ir pavyzdys,
@@ -9444,7 +9422,6 @@
 Please check your Plaid client ID and secret values,Patikrinkite „Plaid“ kliento ID ir slaptas vertes,
 Bank transaction creation error,Banko operacijos kūrimo klaida,
 Unit of Measurement,Matavimo vienetas,
-Row #{}: Selling rate for item {} is lower than its {}. Selling rate should be atleast {},# Eilutė: {} prekės pardavimo rodiklis yra mažesnis nei jos {}. Pardavimo norma turėtų būti mažiausiai {},
 Fiscal Year {0} Does Not Exist,Finansiniai metai {0} neegzistuoja,
 Row # {0}: Returned Item {1} does not exist in {2} {3},{0} eilutė: grąžinto elemento {1} nėra {2} {3},
 Valuation type charges can not be marked as Inclusive,Vertinimo tipo mokesčiai negali būti pažymėti kaip imtinai,
@@ -9598,8 +9575,60 @@
 Response Time for {0} priority in row {1} can't be greater than Resolution Time.,Atsakymo laikas pagal {0} prioritetą {1} eilutėje negali būti ilgesnis nei skiriamosios gebos laikas.,
 {0} is not enabled in {1},„{0}“ neįgalinta {1},
 Group by Material Request,Grupuoti pagal medžiagos užklausą,
-"Row {0}: For Supplier {0}, Email Address is Required to Send Email",{0} eilutė: Tiekėjui {0} el. Pašto adresas reikalingas norint siųsti el. Laišką,
 Email Sent to Supplier {0},El. Laiškas išsiųstas tiekėjui {0},
 "The Access to Request for Quotation From Portal is Disabled. To Allow Access, Enable it in Portal Settings.","Išjungta prieiga prie prašymo pateikti citatą iš portalo. Norėdami leisti prieigą, įjunkite jį portalo nustatymuose.",
 Supplier Quotation {0} Created,Tiekėjo pasiūlymas {0} sukurtas,
 Valid till Date cannot be before Transaction Date,Galiojanti iki datos negali būti ankstesnė už operacijos datą,
+Unlink Advance Payment on Cancellation of Order,Atsiekite išankstinį mokėjimą atšaukdami užsakymą,
+"Simple Python Expression, Example: territory != 'All Territories'","Paprasta „Python“ išraiška, pavyzdys: territorija! = &#39;Visos teritorijos&#39;",
+Sales Contributions and Incentives,Pardavimo įnašai ir paskatos,
+Sourced by Supplier,Tiekėjas tiekėjas,
+Total weightage assigned should be 100%.<br>It is {0},Bendras priskirtas svoris turėtų būti 100%.<br> Tai yra {0},
+Account {0} exists in parent company {1}.,Paskyra {0} yra pagrindinėje įmonėje {1}.,
+"To overrule this, enable '{0}' in company {1}","Norėdami tai atmesti, įgalinkite „{0}“ įmonėje {1}",
+Invalid condition expression,Netinkama sąlygos išraiška,
+Please Select a Company First,Pirmiausia pasirinkite įmonę,
+Please Select Both Company and Party Type First,"Pirmiausia pasirinkite tiek įmonės, tiek vakarėlio tipą",
+Provide the invoice portion in percent,Sąskaitos faktūros dalį pateikite procentais,
+Give number of days according to prior selection,Nurodykite dienų skaičių pagal išankstinę atranką,
+Email Details,Išsami el. Pašto informacija,
+"Select a greeting for the receiver. E.g. Mr., Ms., etc.","Pasirinkite sveikinimą gavėjui. Pvz., Ponia, ponia ir kt.",
+Preview Email,Peržiūrėti el. Paštą,
+Please select a Supplier,Pasirinkite tiekėją,
+Supplier Lead Time (days),Tiekėjo vykdymo laikas (dienomis),
+"Home, Work, etc.","Namai, darbas ir kt.",
+Exit Interview Held On,„Exit Interview Held On“,
+Condition and formula,Sąlyga ir formulė,
+Sets 'Target Warehouse' in each row of the Items table.,Kiekvienoje lentelės Elementai eilutėje nustatomas „Tikslinis sandėlis“.,
+Sets 'Source Warehouse' in each row of the Items table.,Kiekvienoje lentelės „Elementai“ eilutėje nustatomas „Šaltinio sandėlis“.,
+POS Register,POS registras,
+"Can not filter based on POS Profile, if grouped by POS Profile","Negalima filtruoti pagal POS profilį, jei jis grupuojamas pagal POS profilį",
+"Can not filter based on Customer, if grouped by Customer","Negalima filtruoti pagal klientą, jei jis sugrupuotas pagal klientą",
+"Can not filter based on Cashier, if grouped by Cashier","Negalima filtruoti pagal kasininką, jei grupuojama pagal kasininką",
+Payment Method,Mokėjimo būdas,
+"Can not filter based on Payment Method, if grouped by Payment Method","Negalima filtruoti pagal mokėjimo metodą, jei jis grupuojamas pagal mokėjimo metodą",
+Supplier Quotation Comparison,Tiekėjų pasiūlymų palyginimas,
+Price per Unit (Stock UOM),Vieneto kaina (atsargų UOM),
+Group by Supplier,Grupuoti pagal tiekėją,
+Group by Item,Grupuoti pagal punktą,
+Remember to set {field_label}. It is required by {regulation}.,Nepamirškite nustatyti {field_label}. To reikalauja {reglamentas}.,
+Enrollment Date cannot be before the Start Date of the Academic Year {0},Registracijos data negali būti ankstesnė nei mokslo metų pradžios data {0},
+Enrollment Date cannot be after the End Date of the Academic Term {0},Registracijos data negali būti po akademinio laikotarpio pabaigos datos {0},
+Enrollment Date cannot be before the Start Date of the Academic Term {0},Registracijos data negali būti ankstesnė už akademinio laikotarpio pradžios datą {0},
+Posting future transactions are not allowed due to Immutable Ledger,Negalima skelbti būsimų operacijų dėl nekintamos knygos,
+Future Posting Not Allowed,Ateityje skelbti negalima,
+"To enable Capital Work in Progress Accounting, ",Norėdami įgalinti kapitalo darbo eigą,
+you must select Capital Work in Progress Account in accounts table,sąskaitų lentelėje turite pasirinkti Vykdomo kapitalo darbo sąskaitą,
+You can also set default CWIP account in Company {},Taip pat galite nustatyti numatytąją CWIP paskyrą įmonėje {},
+The Request for Quotation can be accessed by clicking on the following button,Su prašymu pateikti pasiūlymą galima susipažinti spustelėjus šį mygtuką,
+Regards,Pagarbiai,
+Please click on the following button to set your new password,"Norėdami nustatyti naują slaptažodį, spustelėkite šį mygtuką",
+Update Password,Atnaujinti slaptažodį,
+Row #{}: Selling rate for item {} is lower than its {}. Selling {} should be atleast {},# Eilutė: {} prekės pardavimo rodiklis yra mažesnis nei jos {}. Pardavimas {} turėtų būti mažiausiai {},
+You can alternatively disable selling price validation in {} to bypass this validation.,"Taip pat galite išjungti pardavimo kainos patvirtinimą {}, kad apeitumėte šį patvirtinimą.",
+Invalid Selling Price,Netinkama pardavimo kaina,
+Address needs to be linked to a Company. Please add a row for Company in the Links table.,Adresas turi būti susietas su įmone. Lentelėje Nuorodos pridėkite įmonės eilutę.,
+Company Not Linked,Įmonė nesusieta,
+Import Chart of Accounts from CSV / Excel files,Importuoti sąskaitų planą iš CSV / Excel failų,
+Completed Qty cannot be greater than 'Qty to Manufacture',Užpildytas kiekis negali būti didesnis nei „Gamybos kiekis“,
+"Row {0}: For Supplier {1}, Email Address is Required to send an email","{0} eilutė: Tiekėjui {1}, norint išsiųsti el. Laišką, būtinas el. Pašto adresas",
diff --git a/erpnext/translations/lv.csv b/erpnext/translations/lv.csv
index 7f5f87d..73c8d2b 100644
--- a/erpnext/translations/lv.csv
+++ b/erpnext/translations/lv.csv
@@ -521,7 +521,6 @@
 Chargeble,Maksas,
 Charges are updated in Purchase Receipt against each item,Izmaksas tiek atjauninātas pirkuma čeka pret katru posteni,
 "Charges will be distributed proportionately based on item qty or amount, as per your selection","Maksas tiks izplatīts proporcionāli, pamatojoties uz vienību Daudz vai summu, kā par savu izvēli",
-Chart Of Accounts,Kontu,
 Chart of Cost Centers,Shēma izmaksu centriem,
 Check all,Pārbaudi visu,
 Checkout,Izrakstīšanās,
@@ -581,7 +580,6 @@
 Compensatory Off,Kompensējošs Off,
 Compensatory leave request days not in valid holidays,Kompensācijas atvaļinājuma pieprasījuma dienas nav derīgas brīvdienās,
 Complaint,Sūdzība,
-Completed Qty can not be greater than 'Qty to Manufacture',"Pabeigts Daudz nevar būt lielāks par ""Daudz, lai ražotu""",
 Completion Date,Pabeigšana Datums,
 Computer,Dators,
 Condition,Nosacījums,
@@ -2033,7 +2031,6 @@
 Please select Charge Type first,"Lūdzu, izvēlieties iekasēšanas veids pirmais",
 Please select Company,"Lūdzu, izvēlieties Uzņēmums",
 Please select Company and Designation,"Lūdzu, atlasiet Uzņēmums un Apzīmējums",
-Please select Company and Party Type first,"Lūdzu, izvēlieties Uzņēmumu un Party tips pirmais",
 Please select Company and Posting Date to getting entries,"Lūdzu, izvēlieties Uzņēmums un Publicēšanas datums, lai saņemtu ierakstus",
 Please select Company first,"Lūdzu, izvēlieties Company pirmais",
 Please select Completion Date for Completed Asset Maintenance Log,"Lūdzu, atlasiet pabeigtā īpašuma uzturēšanas žurnāla pabeigšanas datumu",
@@ -2980,7 +2977,6 @@
 The name of your company for which you are setting up this system.,"Jūsu uzņēmuma nosaukums, par kuru jums ir izveidot šo sistēmu.",
 The number of shares and the share numbers are inconsistent,Akciju skaits un akciju skaits ir pretrunīgi,
 The payment gateway account in plan {0} is different from the payment gateway account in this payment request,Plāna {0} maksājuma vārtejas konts atšķiras no maksājuma vārtejas konta šajā maksājuma pieprasījumā,
-The request for quotation can be accessed by clicking on the following link,"Par citāts pieprasījumu var piekļūt, uzklikšķinot uz šīs saites",
 The selected BOMs are not for the same item,Izvēlētie BOMs nav par to pašu posteni,
 The selected item cannot have Batch,Izvēlētais objekts nevar būt partijas,
 The seller and the buyer cannot be the same,Pārdevējs un pircējs nevar būt vienādi,
@@ -3130,7 +3126,6 @@
 Total flexible benefit component amount {0} should not be less than max benefits {1},Kopējā elastīgā pabalsta komponenta summa {0} nedrīkst būt mazāka par maksimālo pabalstu summu {1},
 Total hours: {0},Kopējais stundu skaits: {0},
 Total leaves allocated is mandatory for Leave Type {0},Kopējās piešķirtās lapas ir obligātas attiecībā uz atstāšanas veidu {0},
-Total weightage assigned should be 100%. It is {0},Kopā weightage piešķirts vajadzētu būt 100%. Tas ir {0},
 Total working hours should not be greater than max working hours {0},Kopējais darba laiks nedrīkst būt lielāks par max darba stundas {0},
 Total {0} ({1}),Kopā {0} ({1}),
 "Total {0} for all items is zero, may be you should change 'Distribute Charges Based On'","Kopā {0} uz visiem posteņiem ir nulle, var būt jums vajadzētu mainīt &quot;Sadalīt maksa ir atkarīga no&quot;",
@@ -3544,7 +3539,6 @@
 Company field is required,Jānorāda uzņēmuma lauks,
 Creating Dimensions...,Notiek kategoriju izveidošana ...,
 Duplicate entry against the item code {0} and manufacturer {1},Ieraksta dublikāts attiecībā uz preces kodu {0} un ražotāju {1},
-Import Chart Of Accounts from CSV / Excel files,Importējiet kontu diagrammu no CSV / Excel failiem,
 Invalid GSTIN! The input you've entered doesn't match the GSTIN format for UIN Holders or Non-Resident OIDAR Service Providers,Nederīgs GSTIN! Jūsu ievadītā ievade neatbilst GSTIN formātam UIN turētājiem vai nerezidentu OIDAR pakalpojumu sniedzējiem,
 Invoice Grand Total,Rēķins kopā,
 Last carbon check date cannot be a future date,Pēdējais oglekļa pārbaudes datums nevar būt nākotnes datums,
@@ -3921,7 +3915,6 @@
 Plaid public token error,Plaša publiskā marķiera kļūda,
 Plaid transactions sync error,Riska darījuma sinhronizācijas kļūda,
 Please check the error log for details about the import errors,"Lūdzu, pārbaudiet kļūdu žurnālu, lai iegūtu sīkāku informāciju par importēšanas kļūdām",
-Please click on the following link to set your new password,"Lūdzu, noklikšķiniet uz šīs saites, lai uzstādītu jauno paroli",
 Please create <b>DATEV Settings</b> for Company <b>{}</b>.,"Lūdzu, izveidojiet <b>DATEV iestatījumus</b> uzņēmumam <b>{}</b> .",
 Please create adjustment Journal Entry for amount {0} ,"Lūdzu, izveidojiet korekcijas žurnāla ierakstu summai {0}.",
 Please do not create more than 500 items at a time,"Lūdzu, neveidojiet vairāk par 500 vienībām vienlaikus",
@@ -3997,6 +3990,7 @@
 Release date must be in the future,Izdošanas datumam jābūt nākotnē,
 Relieving Date must be greater than or equal to Date of Joining,Atvieglojuma datumam jābūt lielākam vai vienādam ar iestāšanās datumu,
 Rename,Pārdēvēt,
+Rename Not Allowed,Pārdēvēt nav atļauts,
 Repayment Method is mandatory for term loans,Atmaksas metode ir obligāta termiņa aizdevumiem,
 Repayment Start Date is mandatory for term loans,Atmaksas sākuma datums ir obligāts termiņaizdevumiem,
 Report Item,Pārskata vienums,
@@ -4043,7 +4037,6 @@
 Select All,Izvēlēties visu,
 Select Difference Account,Atlasiet Starpības konts,
 Select a Default Priority.,Atlasiet noklusējuma prioritāti.,
-Select a Supplier from the Default Supplier List of the items below.,Zemāk esošo vienumu noklusējuma sarakstā atlasiet piegādātāju.,
 Select a company,Izvēlieties uzņēmumu,
 Select finance book for the item {0} at row {1},Atlasiet {0} posteņa {1} finanšu grāmatu,
 Select only one Priority as Default.,Atlasiet tikai vienu prioritāti kā noklusējumu.,
@@ -4247,7 +4240,6 @@
 Actual ,Faktisks,
 Add to cart,Pievienot grozam,
 Budget,Budžets,
-Chart Of Accounts Importer,Importētāja kontu diagramma,
 Chart of Accounts,Kontu diagramma,
 Customer database.,Klientu datu bāze.,
 Days Since Last order,Dienas kopš pēdējā pasūtījuma,
@@ -4546,7 +4538,6 @@
 Check Supplier Invoice Number Uniqueness,Pārbaudiet Piegādātājs Rēķina numurs Unikalitāte,
 Make Payment via Journal Entry,Veikt maksājumus caur Journal Entry,
 Unlink Payment on Cancellation of Invoice,Atsaistītu maksājumu par anulēšana rēķina,
-Unlink Advance Payment on Cancelation of Order,Atsaistiet avansa maksājumu par pasūtījuma atcelšanu,
 Book Asset Depreciation Entry Automatically,Grāmatu Aktīvu nolietojums Entry Automātiski,
 Automatically Add Taxes and Charges from Item Tax Template,Automātiski pievienojiet nodokļus un nodevas no vienumu nodokļu veidnes,
 Automatically Fetch Payment Terms,Automātiski ienest maksājuma noteikumus,
@@ -4940,7 +4931,6 @@
 POS Customer Group,POS Klientu Group,
 POS Field,POS lauks,
 POS Item Group,POS Prece Group,
-[Select],[Izvēlēties],
 Company Address,Uzņēmuma adrese,
 Update Stock,Update Stock,
 Ignore Pricing Rule,Ignorēt cenu veidošanas likumu,
@@ -6481,7 +6471,6 @@
 Appraisal Template,Izvērtēšana Template,
 For Employee Name,Par darbinieku Vārds,
 Goals,Mērķi,
-Calculate Total Score,Aprēķināt kopējo punktu skaitu,
 Total Score (Out of 5),Total Score (no 5),
 "Any other remarks, noteworthy effort that should go in the records.","Jebkādas citas piezīmes, ievērības cienīgs piepūles ka jāiet ierakstos.",
 Appraisal Goal,Izvērtēšana Goal,
@@ -6599,11 +6588,6 @@
 Reason for Leaving,Iemesls Atstājot,
 Leave Encashed?,Atvaļinājums inkasēta?,
 Encashment Date,Inkasācija Datums,
-Exit Interview Details,Iziet Intervija Details,
-Held On,Notika,
-Reason for Resignation,Iemesls atkāpšanās no amata,
-Better Prospects,Labākas izredzes,
-Health Concerns,Veselības problēmas,
 New Workplace,Jaunajā darbavietā,
 HR-EAD-.YYYY.-,HR-EAD-.YYYY.-,
 Returned Amount,Atgrieztā summa,
@@ -8239,9 +8223,6 @@
 Manufacturers used in Items,Ražotāji izmanto preces,
 Limited to 12 characters,Ierobežots līdz 12 simboliem,
 MAT-MR-.YYYY.-,MAT-MR-.YYYY.-,
-Set Warehouse,Iestatiet noliktavu,
-Sets 'For Warehouse' in each row of the Items table.,Tabulas Items katrā rindā iestata &#39;For Warehouse&#39;.,
-Requested For,Pieprasīts Par,
 Partially Ordered,Daļēji pasūtīts,
 Transferred,Pārskaitīts,
 % Ordered,% Pasūtīts,
@@ -8690,8 +8671,6 @@
 Select warehouse for material requests,Atlasiet noliktavu materiālu pieprasījumiem,
 Transfer Materials For Warehouse {0},Materiālu pārsūtīšana noliktavai {0},
 Production Plan Material Request Warehouse,Ražošanas plāna materiālu pieprasījumu noliktava,
-Set From Warehouse,Komplekts No noliktavas,
-Source Warehouse (Material Transfer),Avota noliktava (materiālu pārsūtīšana),
 Sets 'Source Warehouse' in each row of the items table.,Katrā vienumu tabulas rindā iestata “Avota noliktava”.,
 Sets 'Target Warehouse' in each row of the items table.,Katrā vienumu tabulas rindā iestata &#39;Mērķa noliktava&#39;.,
 Show Cancelled Entries,Rādīt atceltos ierakstus,
@@ -9157,7 +9136,6 @@
 Is Income Tax Component,Ir ienākuma nodokļa sastāvdaļa,
 Component properties and references ,Komponentu īpašības un atsauces,
 Additional Salary ,Papildalga,
-Condtion and formula,Nosacījums un formula,
 Unmarked days,Nezīmētas dienas,
 Absent Days,Nebūšanas dienas,
 Conditions and Formula variable and example,Nosacījumi un Formulas mainīgais un piemērs,
@@ -9444,7 +9422,6 @@
 Please check your Plaid client ID and secret values,"Lūdzu, pārbaudiet savu Plaid klienta ID un slepenās vērtības",
 Bank transaction creation error,Kļūda bankas darījuma izveidē,
 Unit of Measurement,Mērvienība,
-Row #{}: Selling rate for item {} is lower than its {}. Selling rate should be atleast {},#. Rinda: vienuma {} pārdošanas likme ir zemāka par tā {}. Pārdošanas likmei jābūt vismaz {},
 Fiscal Year {0} Does Not Exist,Fiskālais gads {0} nepastāv,
 Row # {0}: Returned Item {1} does not exist in {2} {3},{0}. Rinda: atgrieztais vienums {1} nepastāv šeit: {2} {3},
 Valuation type charges can not be marked as Inclusive,Novērtēšanas veida izmaksas nevar atzīmēt kā iekļaujošas,
@@ -9598,8 +9575,60 @@
 Response Time for {0} priority in row {1} can't be greater than Resolution Time.,Reakcijas laiks {0} prioritātei rindā {1} nevar būt ilgāks par izšķirtspējas laiku.,
 {0} is not enabled in {1},Vietne {0} nav iespējota šeit: {1},
 Group by Material Request,Grupēt pēc materiāla pieprasījuma,
-"Row {0}: For Supplier {0}, Email Address is Required to Send Email","{0} rinda: Piegādātājam {0} e-pasta adrese ir nepieciešama, lai nosūtītu e-pastu",
 Email Sent to Supplier {0},E-pasts nosūtīts piegādātājam {0},
 "The Access to Request for Quotation From Portal is Disabled. To Allow Access, Enable it in Portal Settings.","Piekļuve pieprasījumam no portāla ir atspējota. Lai atļautu piekļuvi, iespējojiet to portāla iestatījumos.",
 Supplier Quotation {0} Created,Piegādātāja piedāvājums {0} izveidots,
 Valid till Date cannot be before Transaction Date,Derīgs līdz datumam nevar būt pirms darījuma datuma,
+Unlink Advance Payment on Cancellation of Order,"Atsaistot avansa maksājumu, atceļot pasūtījumu",
+"Simple Python Expression, Example: territory != 'All Territories'","Vienkārša Python izteiksme, piemērs: territorija! = &#39;Visas teritorijas&#39;",
+Sales Contributions and Incentives,Pārdošanas iemaksas un stimuli,
+Sourced by Supplier,Piegādātājs,
+Total weightage assigned should be 100%.<br>It is {0},Kopējam piešķirtajam svaram jābūt 100%.<br> Tas ir {0},
+Account {0} exists in parent company {1}.,Konts {0} pastāv mātes uzņēmumā {1}.,
+"To overrule this, enable '{0}' in company {1}","Lai to atceltu, iespējojiet “{0}” uzņēmumā {1}",
+Invalid condition expression,Nederīga nosacījuma izteiksme,
+Please Select a Company First,"Lūdzu, vispirms atlasiet uzņēmumu",
+Please Select Both Company and Party Type First,"Lūdzu, vispirms atlasiet gan uzņēmuma, gan ballītes veidu",
+Provide the invoice portion in percent,Norādiet rēķina daļu procentos,
+Give number of days according to prior selection,Norādiet dienu skaitu pēc iepriekšējas izvēles,
+Email Details,E-pasta informācija,
+"Select a greeting for the receiver. E.g. Mr., Ms., etc.","Izvēlieties sveicienu uztvērējam. Piemēram, kungs, kundze utt.",
+Preview Email,Priekšskatīt e-pastu,
+Please select a Supplier,"Lūdzu, izvēlieties piegādātāju",
+Supplier Lead Time (days),Piegādātāja izpildes laiks (dienas),
+"Home, Work, etc.","Mājas, darbs utt.",
+Exit Interview Held On,Izejas intervija notiek,
+Condition and formula,Stāvoklis un formula,
+Sets 'Target Warehouse' in each row of the Items table.,Katrā tabulas Vienumi rindā iestata &#39;Mērķa noliktava&#39;.,
+Sets 'Source Warehouse' in each row of the Items table.,Katrā tabulas Elementi rindā iestata “Avota noliktava”.,
+POS Register,POS reģistrs,
+"Can not filter based on POS Profile, if grouped by POS Profile","Nevar filtrēt, pamatojoties uz POS profilu, ja tas ir grupēts pēc POS profila",
+"Can not filter based on Customer, if grouped by Customer","Nevar filtrēt, pamatojoties uz klientu, ja tas ir grupēts pēc klienta",
+"Can not filter based on Cashier, if grouped by Cashier","Nevar filtrēt, pamatojoties uz kasieri, ja tos sagrupē kasieris",
+Payment Method,Apmaksas veids,
+"Can not filter based on Payment Method, if grouped by Payment Method","Nevar filtrēt, pamatojoties uz maksājuma veidu, ja tas ir grupēts pēc maksājuma veida",
+Supplier Quotation Comparison,Piegādātāju cenu salīdzinājums,
+Price per Unit (Stock UOM),Vienības cena (krājuma UOM),
+Group by Supplier,Grupēt pēc piegādātāja,
+Group by Item,Grupēt pēc vienumiem,
+Remember to set {field_label}. It is required by {regulation}.,Atcerieties iestatīt {field_label}. To prasa {regulējums}.,
+Enrollment Date cannot be before the Start Date of the Academic Year {0},Reģistrācijas datums nevar būt pirms akadēmiskā gada sākuma datuma {0},
+Enrollment Date cannot be after the End Date of the Academic Term {0},Reģistrācijas datums nevar būt pēc akadēmiskā termiņa beigu datuma {0},
+Enrollment Date cannot be before the Start Date of the Academic Term {0},Reģistrācijas datums nevar būt pirms akadēmiskā termiņa sākuma datuma {0},
+Posting future transactions are not allowed due to Immutable Ledger,Turpmāko darījumu grāmatošana nav atļauta maināmās grāmatas dēļ,
+Future Posting Not Allowed,Turpmākā norīkošana nav atļauta,
+"To enable Capital Work in Progress Accounting, ","Lai iespējotu kapitāla darbu grāmatvedībā,",
+you must select Capital Work in Progress Account in accounts table,kontu tabulā jāatlasa Kapitāla darba process,
+You can also set default CWIP account in Company {},Varat arī iestatīt noklusējuma CWIP kontu uzņēmumā {},
+The Request for Quotation can be accessed by clicking on the following button,"Piedāvājuma pieprasījumam var piekļūt, noklikšķinot uz šīs pogas",
+Regards,Sveicieni,
+Please click on the following button to set your new password,"Lūdzu, noklikšķiniet uz šīs pogas, lai iestatītu jauno paroli",
+Update Password,Atjaunināt paroli,
+Row #{}: Selling rate for item {} is lower than its {}. Selling {} should be atleast {},#. Rinda: vienuma {} pārdošanas likme ir zemāka par tā {}. Pārdošanai {} jābūt vismaz {},
+You can alternatively disable selling price validation in {} to bypass this validation.,"Varat arī atspējot pārdošanas cenas apstiprināšanu vietnē {}, lai apietu šo validāciju.",
+Invalid Selling Price,Nederīga pārdošanas cena,
+Address needs to be linked to a Company. Please add a row for Company in the Links table.,"Adresei jābūt saistītai ar uzņēmumu. Lūdzu, tabulā Saites pievienojiet rindu uzņēmumam Uzņēmums.",
+Company Not Linked,Uzņēmums nav saistīts,
+Import Chart of Accounts from CSV / Excel files,Importēt kontu plānu no CSV / Excel failiem,
+Completed Qty cannot be greater than 'Qty to Manufacture',Pabeigtais daudzums nedrīkst būt lielāks par “Daudzums izgatavošanai”,
+"Row {0}: For Supplier {1}, Email Address is Required to send an email",{0} rinda: piegādātājam {1} e-pasta adreses nosūtīšanai ir nepieciešama e-pasta adrese,
diff --git a/erpnext/translations/mk.csv b/erpnext/translations/mk.csv
index 99ef866..3f969ac 100644
--- a/erpnext/translations/mk.csv
+++ b/erpnext/translations/mk.csv
@@ -521,7 +521,6 @@
 Chargeble,Шаргел,
 Charges are updated in Purchase Receipt against each item,Обвиненијата се ажурирани Набавка Потврда против секоја ставка,
 "Charges will be distributed proportionately based on item qty or amount, as per your selection","Кривична пријава ќе биде дистрибуиран пропорционално врз основа на точка количество: Контакт лице или количина, како на вашиот избор",
-Chart Of Accounts,Сметковниот план,
 Chart of Cost Centers,Шема на трошоците центри,
 Check all,Проверете ги сите,
 Checkout,Плаќање,
@@ -581,7 +580,6 @@
 Compensatory Off,Обесштетување Off,
 Compensatory leave request days not in valid holidays,Денови за барање компензаторско отсуство не се во валидни празници,
 Complaint,Жалба,
-Completed Qty can not be greater than 'Qty to Manufacture',Завршено Количина не може да биде поголем од &quot;Количина на производство&quot;,
 Completion Date,Датум на завршување,
 Computer,Компјутер,
 Condition,Состојба,
@@ -2033,7 +2031,6 @@
 Please select Charge Type first,Ве молиме изберете Полнење Тип прв,
 Please select Company,Ве молиме изберете ја компанијата,
 Please select Company and Designation,Изберете компанија и ознака,
-Please select Company and Party Type first,Ве молиме изберете компанија и Партијата Тип прв,
 Please select Company and Posting Date to getting entries,Ве молиме изберете Компанија и Датум на објавување за да добивате записи,
 Please select Company first,Ве молиме изберете ја првата компанија,
 Please select Completion Date for Completed Asset Maintenance Log,Изберете датум за завршување на дневник за одржување на средствата,
@@ -2980,7 +2977,6 @@
 The name of your company for which you are setting up this system.,Името на вашата компанија за која сте за создавање на овој систем.,
 The number of shares and the share numbers are inconsistent,Бројот на акции и бројот на акции се недоследни,
 The payment gateway account in plan {0} is different from the payment gateway account in this payment request,Сметката за платежна портал во планот {0} е различна од сметката на платежната порта во ова барање за плаќање,
-The request for quotation can be accessed by clicking on the following link,Барањето за прибирање на понуди може да се пристапи со кликнување на следниов линк,
 The selected BOMs are not for the same item,Избраните BOMs не се за истата ставка,
 The selected item cannot have Batch,На избраната ставка не може да има Batch,
 The seller and the buyer cannot be the same,Продавачот и купувачот не можат да бидат исти,
@@ -3130,7 +3126,6 @@
 Total flexible benefit component amount {0} should not be less than max benefits {1},Вкупната количина на флексибилен придонес {0} не треба да биде помала од максималната придобивка {1},
 Total hours: {0},Вкупно часови: {0},
 Total leaves allocated is mandatory for Leave Type {0},Вкупниот износ на лисја е задолжителен за Тип за напуштање {0},
-Total weightage assigned should be 100%. It is {0},Вкупно weightage доделени треба да биде 100%. Тоа е {0},
 Total working hours should not be greater than max working hours {0},Вкупно работно време не смее да биде поголема од работното време max {0},
 Total {0} ({1}),Вкупно {0} ({1}),
 "Total {0} for all items is zero, may be you should change 'Distribute Charges Based On'","Вкупно {0} за сите предмети е нула, може да треба да се менува &quot;Дистрибуирање промени врз основа на&quot;",
@@ -3544,7 +3539,6 @@
 Company field is required,Потребно е поле на компанијата,
 Creating Dimensions...,Создавање димензии ...,
 Duplicate entry against the item code {0} and manufacturer {1},Дупликат внес против кодот на објектот {0} и производител {1},
-Import Chart Of Accounts from CSV / Excel files,Увези ја табелата на сметки од датотеките CSV / Excel,
 Invalid GSTIN! The input you've entered doesn't match the GSTIN format for UIN Holders or Non-Resident OIDAR Service Providers,Невалиден GSTIN! Внесот што сте го внеле не се совпаѓа со форматот GSTIN за имателите на UIN или Даватели на услуги што не се резиденти на OIDAR,
 Invoice Grand Total,Фактура вкупно,
 Last carbon check date cannot be a future date,Последниот датум за проверка на јаглерод не може да биде иден датум,
@@ -3921,7 +3915,6 @@
 Plaid public token error,Грешна грешка во карирани јавни знаци,
 Plaid transactions sync error,Грешка во синхронизацијата со карирани трансакции,
 Please check the error log for details about the import errors,Проверете го дневникот за грешки за детали за грешките при увозот,
-Please click on the following link to set your new password,Ве молиме кликнете на следниот линк за да го поставите нова лозинка,
 Please create <b>DATEV Settings</b> for Company <b>{}</b>.,"Ве молиме, креирајте ги <b>поставките DATEV</b> за компанијата <b>{</b> .",
 Please create adjustment Journal Entry for amount {0} ,"Ве молиме, креирајте припис за весник за износ amount 0}",
 Please do not create more than 500 items at a time,"Ве молиме, не создавајте повеќе од 500 артикли истовремено",
@@ -3997,6 +3990,7 @@
 Release date must be in the future,Датумот на објавување мора да биде во иднина,
 Relieving Date must be greater than or equal to Date of Joining,Датумот на ослободување мора да биде поголем или еднаков на датумот на придружување,
 Rename,Преименувај,
+Rename Not Allowed,Преименување не е дозволено,
 Repayment Method is mandatory for term loans,Метод на отплата е задолжителен за заеми со рок,
 Repayment Start Date is mandatory for term loans,Датумот на започнување на отплата е задолжителен за заеми со термин,
 Report Item,Известување ставка,
@@ -4043,7 +4037,6 @@
 Select All,Избери ги сите,
 Select Difference Account,Изберете сметка за разлика,
 Select a Default Priority.,Изберете Стандарден приоритет.,
-Select a Supplier from the Default Supplier List of the items below.,Изберете снабдувач од списокот со стандардна понудувач на артиклите подолу.,
 Select a company,Изберете компанија,
 Select finance book for the item {0} at row {1},Изберете книга за финансии за производот {0} по ред {1,
 Select only one Priority as Default.,Изберете само еден Приоритет како Стандарден.,
@@ -4247,7 +4240,6 @@
 Actual ,Крај,
 Add to cart,Додади во кошничка,
 Budget,Буџет,
-Chart Of Accounts Importer,Табела на сметки увозник,
 Chart of Accounts,Сметка на сметки,
 Customer database.,База на податоци за клиентите.,
 Days Since Last order,Дена од денот на нарачка,
@@ -4546,7 +4538,6 @@
 Check Supplier Invoice Number Uniqueness,Проверете Добавувачот број на фактурата Единственост,
 Make Payment via Journal Entry,Се направи исплата преку весник Влегување,
 Unlink Payment on Cancellation of Invoice,Прекин на врска плаќање за поништување на Фактура,
-Unlink Advance Payment on Cancelation of Order,Одврзете авансно плаќање за откажување на нарачката,
 Book Asset Depreciation Entry Automatically,Книга Асет Амортизација Влегување Автоматски,
 Automatically Add Taxes and Charges from Item Tax Template,Автоматски додавајте даноци и такси од образецот за данок на артикали,
 Automatically Fetch Payment Terms,Автоматски дополнете услови за плаќање,
@@ -4940,7 +4931,6 @@
 POS Customer Group,POS клиентите група,
 POS Field,Пос поле,
 POS Item Group,ПОС Точка група,
-[Select],[Избери],
 Company Address,адреса на компанијата,
 Update Stock,Ажурирање берза,
 Ignore Pricing Rule,Игнорирај Цените Правило,
@@ -6481,7 +6471,6 @@
 Appraisal Template,Процена Шаблон,
 For Employee Name,За име на вработениот,
 Goals,Цели,
-Calculate Total Score,Пресметај Вкупен резултат,
 Total Score (Out of 5),Вкупен Резултат (Од 5),
 "Any other remarks, noteworthy effort that should go in the records.","Било други забелешки, да се спомене напори кои треба да одат во евиденцијата.",
 Appraisal Goal,Процена Цел,
@@ -6599,11 +6588,6 @@
 Reason for Leaving,Причина за напуштање,
 Leave Encashed?,Остави Encashed?,
 Encashment Date,Датум на инкасо,
-Exit Interview Details,Излез Интервју Детали за,
-Held On,Одржана на,
-Reason for Resignation,Причина за оставка,
-Better Prospects,Подобри можности,
-Health Concerns,Здравствени проблеми,
 New Workplace,Нов работен простор,
 HR-EAD-.YYYY.-,HR-EAD-.YYYY.-,
 Returned Amount,Врати износ,
@@ -8239,9 +8223,6 @@
 Manufacturers used in Items,Производителите користат во Предмети,
 Limited to 12 characters,Ограничен на 12 карактери,
 MAT-MR-.YYYY.-,MAT-MR-.YYYY.-,
-Set Warehouse,Поставете складиште,
-Sets 'For Warehouse' in each row of the Items table.,Поставува „За магацин“ во секој ред од табелата со Артикли.,
-Requested For,Се бара за,
 Partially Ordered,Делумно нарачано,
 Transferred,пренесени,
 % Ordered,Нареди%,
@@ -8690,8 +8671,6 @@
 Select warehouse for material requests,Изберете магацин за материјални барања,
 Transfer Materials For Warehouse {0},Трансфер материјали за магацин {0},
 Production Plan Material Request Warehouse,План за производство Магацин за барање материјали,
-Set From Warehouse,Поставен од магацин,
-Source Warehouse (Material Transfer),Извор магацин (трансфер на материјал),
 Sets 'Source Warehouse' in each row of the items table.,Поставува „Магацински извор“ во секој ред од табелата со ставки.,
 Sets 'Target Warehouse' in each row of the items table.,Поставува „Целен склад“ во секој ред од табелата со ставки.,
 Show Cancelled Entries,Покажете откажани записи,
@@ -9157,7 +9136,6 @@
 Is Income Tax Component,Дали е компонента за данок на доход,
 Component properties and references ,Својства на компонентите и препораки,
 Additional Salary ,Дополнителна плата,
-Condtion and formula,Состојба и формула,
 Unmarked days,Необележани денови,
 Absent Days,Отсутни денови,
 Conditions and Formula variable and example,Услови и формула променлива и пример,
@@ -9444,7 +9422,6 @@
 Please check your Plaid client ID and secret values,"Ве молиме, проверете ги ID на клиентот на Plaid и тајните вредности",
 Bank transaction creation error,Грешка при создавање банкарска трансакција,
 Unit of Measurement,Единица за мерење,
-Row #{}: Selling rate for item {} is lower than its {}. Selling rate should be atleast {},Ред # {}: Стапката на продажба за ставка {} е пониска од нејзината {}. Стапката на продажба треба да биде најмала {},
 Fiscal Year {0} Does Not Exist,Фискална година {0} Не постои,
 Row # {0}: Returned Item {1} does not exist in {2} {3},Ред # {0}: Вратената ставка {1} не постои во {2} {3},
 Valuation type charges can not be marked as Inclusive,Наплатата од типот на проценка не може да се означи како инклузивна,
@@ -9598,8 +9575,60 @@
 Response Time for {0} priority in row {1} can't be greater than Resolution Time.,Времето на одговор за {0} приоритет во редот {1} не може да биде поголемо од времето за резолуција.,
 {0} is not enabled in {1},{0} не е овозможено во {1},
 Group by Material Request,Групирај по материјално барање,
-"Row {0}: For Supplier {0}, Email Address is Required to Send Email","Ред {0}: За добавувачот {0}, потребна е адреса за е-пошта за испраќање е-пошта",
 Email Sent to Supplier {0},Е-пошта е испратена до добавувачот {0},
 "The Access to Request for Quotation From Portal is Disabled. To Allow Access, Enable it in Portal Settings.","Пристапот до барање за понуда од порталот е оневозможен. За да дозволите пристап, овозможете го во Поставките за порталот.",
 Supplier Quotation {0} Created,Цитат на добавувач {0} Создаден,
 Valid till Date cannot be before Transaction Date,Валидно до датумот не може да биде пред датумот на трансакција,
+Unlink Advance Payment on Cancellation of Order,Одврзете авансно плаќање при откажување на нарачката,
+"Simple Python Expression, Example: territory != 'All Territories'","Едноставно изразување на Пајтон, Пример: територија! = &#39;Сите територии&#39;",
+Sales Contributions and Incentives,Придонеси и стимулации за продажба,
+Sourced by Supplier,Извори од добавувач,
+Total weightage assigned should be 100%.<br>It is {0},Вкупната тежина назначена треба да биде 100%.<br> Тоа е {0},
+Account {0} exists in parent company {1}.,Сметката {0} постои во матичната компанија {1}.,
+"To overrule this, enable '{0}' in company {1}","За да го надминете ова, овозможете „{0}“ во компанијата {1}",
+Invalid condition expression,Неважечки израз на состојба,
+Please Select a Company First,Прво изберете компанија,
+Please Select Both Company and Party Type First,Прво изберете ги и типот на компанијата и партијата,
+Provide the invoice portion in percent,Обезбедете дел од фактурата во проценти,
+Give number of days according to prior selection,Дајте број на денови според претходниот избор,
+Email Details,Детали за е-пошта,
+"Select a greeting for the receiver. E.g. Mr., Ms., etc.","Изберете честитка за приемникот. На пр. Г-ѓа, г-ѓа, итн.",
+Preview Email,Преглед на е-пошта,
+Please select a Supplier,Ве молиме изберете снабдувач,
+Supplier Lead Time (days),Време на доставување добавувач (денови),
+"Home, Work, etc.","Дом, работа и сл.",
+Exit Interview Held On,Излез за интервју одржано,
+Condition and formula,Состојба и формула,
+Sets 'Target Warehouse' in each row of the Items table.,Поставува „Целен склад“ во секој ред од табелата со Артикли.,
+Sets 'Source Warehouse' in each row of the Items table.,Поставува „Магацински извор“ во секој ред од табелата со Артикли.,
+POS Register,ПОС регистар,
+"Can not filter based on POS Profile, if grouped by POS Profile","Не може да се филтрира врз основа на ПОС-профилот, ако е групирано според ПОС-профилот",
+"Can not filter based on Customer, if grouped by Customer","Не може да се филтрира врз основа на клиент, ако е групирано од клиент",
+"Can not filter based on Cashier, if grouped by Cashier","Не може да се филтрира врз основа на благајник, ако е групирано по благајник",
+Payment Method,Метод за плаќање,
+"Can not filter based on Payment Method, if grouped by Payment Method","Не може да се филтрира врз основа на Начинот на плаќање, ако е групирано според Начинот на плаќање",
+Supplier Quotation Comparison,Споредба на понуди за добавувачи,
+Price per Unit (Stock UOM),Цена по единица (берза УОМ),
+Group by Supplier,Групација по снабдувач,
+Group by Item,Група по точка,
+Remember to set {field_label}. It is required by {regulation}.,Запомнете да ја поставите {field_label}. Тоа го бара {регулативата}.,
+Enrollment Date cannot be before the Start Date of the Academic Year {0},Датумот на запишување не може да биде пред датумот на почеток на академската година {0},
+Enrollment Date cannot be after the End Date of the Academic Term {0},Датумот на запишување не може да биде по датумот на завршување на академскиот термин {0},
+Enrollment Date cannot be before the Start Date of the Academic Term {0},Датумот на запишување не може да биде пред Датумот на започнување на академскиот термин {0},
+Posting future transactions are not allowed due to Immutable Ledger,Објавувањето на идните трансакции не е дозволено поради непроменливиот Леџер,
+Future Posting Not Allowed,Идниното објавување не е дозволено,
+"To enable Capital Work in Progress Accounting, ","За да овозможите капитално работење во тек сметководство,",
+you must select Capital Work in Progress Account in accounts table,мора да изберете сметка за капитална работа во тек во табелата за сметки,
+You can also set default CWIP account in Company {},Може да поставите и стандардна сметка за CWIP во компанијата {},
+The Request for Quotation can be accessed by clicking on the following button,До Барањето за понуда може да се пристапи со кликнување на следното копче,
+Regards,Со почит,
+Please click on the following button to set your new password,Кликнете на следното копче за да ја поставите вашата нова лозинка,
+Update Password,Ажурирајте ја лозинката,
+Row #{}: Selling rate for item {} is lower than its {}. Selling {} should be atleast {},Ред # {}: Стапката на продажба за ставка {} е пониска од нејзината {}. Продажбата {} треба да биде најмалку {},
+You can alternatively disable selling price validation in {} to bypass this validation.,Можете алтернативно да ја оневозможите потврдата на продажната цена во {} за да ја заобиколите оваа валидација.,
+Invalid Selling Price,Невалидна цена за продажба,
+Address needs to be linked to a Company. Please add a row for Company in the Links table.,"Адресата треба да биде поврзана со компанија. Ве молиме, додадете табела за компанијата во табелата Линкови.",
+Company Not Linked,Компанијата не е поврзана,
+Import Chart of Accounts from CSV / Excel files,Увоз на табела на сметки од датотеки CSV / Excel,
+Completed Qty cannot be greater than 'Qty to Manufacture',Комплетираниот количина не може да биде поголем од „Количина за производство“,
+"Row {0}: For Supplier {1}, Email Address is Required to send an email","Ред {0}: За добавувачот {1}, Потребна е адреса за е-пошта за испраќање е-пошта",
diff --git a/erpnext/translations/ml.csv b/erpnext/translations/ml.csv
index dd300d1..9b8b487 100644
--- a/erpnext/translations/ml.csv
+++ b/erpnext/translations/ml.csv
@@ -521,7 +521,6 @@
 Chargeble,ചാർജബിൾ,
 Charges are updated in Purchase Receipt against each item,വിചാരണ ഓരോ ഇനത്തിനും നേരെ പർച്ചേസ് രസീതിലെ അപ്ഡേറ്റ്,
 "Charges will be distributed proportionately based on item qty or amount, as per your selection","നിരക്കുകൾ നിങ്ങളുടെ നിരക്കു പ്രകാരം, ഐറ്റം qty അല്ലെങ്കിൽ തുക അടിസ്ഥാനമാക്കി ആനുപാതികമായി വിതരണം ചെയ്യും",
-Chart Of Accounts,അക്കൗണ്ട്സ് ചാർട്ട്,
 Chart of Cost Centers,ചെലവ് സെന്റേഴ്സ് ചാർട്ട്,
 Check all,എല്ലാം പരിശോധിക്കുക,
 Checkout,ചെക്ക് ഔട്ട്,
@@ -581,7 +580,6 @@
 Compensatory Off,ഓഫാക്കുക നഷ്ടപരിഹാര,
 Compensatory leave request days not in valid holidays,നഷ്ടമായ അവധിദിനങ്ങളിൽ നഷ്ടപ്പെടാത്ത നഷ്ടപരിഹാര അഭ്യർത്ഥന ദിവസം,
 Complaint,പരാതി,
-Completed Qty can not be greater than 'Qty to Manufacture',പൂർത്തിയാക്കി Qty &#39;Qty നിർമ്മിക്കാനുള്ള&#39; വലുതായിരിക്കും കഴിയില്ല,
 Completion Date,പൂർത്തീകരണ തീയതി,
 Computer,കമ്പ്യൂട്ടർ,
 Condition,കണ്ടീഷൻ,
@@ -2033,7 +2031,6 @@
 Please select Charge Type first,ചാർജ് ടൈപ്പ് ആദ്യ തിരഞ്ഞെടുക്കുക,
 Please select Company,കമ്പനി തിരഞ്ഞെടുക്കുക,
 Please select Company and Designation,ദയവായി കമ്പനിയും ഡയറക്ടറിയും തിരഞ്ഞെടുക്കുക,
-Please select Company and Party Type first,"ആദ്യം കമ്പനി, പാർട്ടി ടൈപ്പ് തിരഞ്ഞെടുക്കുക",
 Please select Company and Posting Date to getting entries,"എൻട്രികൾ ലഭിക്കുന്നതിന് കമ്പനി, പോസ്റ്റിംഗ് തീയതി എന്നിവ തിരഞ്ഞെടുക്കുക",
 Please select Company first,കമ്പനി ആദ്യം തിരഞ്ഞെടുക്കുക,
 Please select Completion Date for Completed Asset Maintenance Log,ദയവായി പൂർത്തിയാക്കിയ അസറ്റ് മെയിന്റനൻസ് ലോഗ് പൂർത്തിയാക്കാൻ ദയവായി പൂർത്തിയാക്കിയ തീയതി തിരഞ്ഞെടുക്കുക,
@@ -2980,7 +2977,6 @@
 The name of your company for which you are setting up this system.,നിങ്ങൾ ഈ സിസ്റ്റം ക്രമീകരിക്കുന്നതിനായി ചെയ്തിട്ടുളള നിങ്ങളുടെ കമ്പനിയുടെ പേര്.,
 The number of shares and the share numbers are inconsistent,ഷെയറുകളുടെയും പങ്കിടൽ നമ്പറുകളുടെയും എണ്ണം അസ്ഥിരമാണ്,
 The payment gateway account in plan {0} is different from the payment gateway account in this payment request,Plan 0 plan പ്ലാനിലെ പേയ്‌മെന്റ് ഗേറ്റ്‌വേ അക്കൗണ്ട് ഈ പേയ്‌മെന്റ് അഭ്യർത്ഥനയിലെ പേയ്‌മെന്റ് ഗേറ്റ്‌വേ അക്കൗണ്ടിൽ നിന്ന് വ്യത്യസ്തമാണ്,
-The request for quotation can be accessed by clicking on the following link,ഉദ്ധരണി അഭ്യർത്ഥന ഇനിപ്പറയുന്ന ലിങ്കിൽ ക്ലിക്കുചെയ്ത് ആക്സസ് ചെയ്യാം,
 The selected BOMs are not for the same item,തിരഞ്ഞെടുത്ത BOMs ഒരേ ഇനം മാത്രമുള്ളതല്ല,
 The selected item cannot have Batch,തിരഞ്ഞെടുത്ത ഐറ്റം ബാച്ച് പാടില്ല,
 The seller and the buyer cannot be the same,വിൽക്കുന്നവനും വാങ്ങുന്നവനും ഒന്നു തന്നെ ആകരുത്,
@@ -3130,7 +3126,6 @@
 Total flexible benefit component amount {0} should not be less than max benefits {1},ഇഷ്ടാനുസൃത ആനുകൂല്യ ഘടക തുക {0} പരമാവധി പ്രയോജനങ്ങളെക്കാൾ കുറവായിരിക്കരുത് {1},
 Total hours: {0},ആകെ മണിക്കൂർ: {0},
 Total leaves allocated is mandatory for Leave Type {0},അനുവദിച്ച മൊത്തം ഇലകൾ നിർബന്ധമായും ഒഴിവാക്കേണ്ടതാണ് {0},
-Total weightage assigned should be 100%. It is {0},അസൈൻ ആകെ വെയിറ്റേജ് 100% ആയിരിക്കണം. ഇത് {0} ആണ്,
 Total working hours should not be greater than max working hours {0},ആകെ തൊഴിൽ സമയം ജോലി സമയം {0} MAX ശ്രേഷ്ഠ പാടില്ല,
 Total {0} ({1}),ആകെ {0} ({1}),
 "Total {0} for all items is zero, may be you should change 'Distribute Charges Based On'","ആകെ {0} എല്ലാ ഇനങ്ങൾ, പൂജ്യമാണ് നിങ്ങൾ &#39;അടിസ്ഥാനമാക്കി ചുമത്തിയിട്ടുള്ള വിതരണം&#39; മാറേണ്ടത് വരാം",
@@ -3544,7 +3539,6 @@
 Company field is required,കമ്പനി ഫീൽഡ് ആവശ്യമാണ്,
 Creating Dimensions...,അളവുകൾ സൃഷ്ടിക്കുന്നു ...,
 Duplicate entry against the item code {0} and manufacturer {1},"Code 0 item, നിർമ്മാതാവ് {1 against എന്നിവയ്‌ക്കെതിരായ തനിപ്പകർപ്പ് എൻട്രി",
-Import Chart Of Accounts from CSV / Excel files,CSV / Excel ഫയലുകളിൽ നിന്ന് അക്ക of ണ്ടുകളുടെ ചാർട്ട് ഇറക്കുമതി ചെയ്യുക,
 Invalid GSTIN! The input you've entered doesn't match the GSTIN format for UIN Holders or Non-Resident OIDAR Service Providers,GSTIN അസാധുവാണ്! നിങ്ങൾ നൽകിയ ഇൻപുട്ട് യുഐഎൻ ഹോൾഡർമാർക്കോ നോൺ-റസിഡന്റ് ഒയിഡാർ സേവന ദാതാക്കൾക്കോ ഉള്ള ജിഎസ്ടിഎൻ ഫോർമാറ്റുമായി പൊരുത്തപ്പെടുന്നില്ല,
 Invoice Grand Total,ഇൻവോയ്സ് ഗ്രാൻഡ് ടോട്ടൽ,
 Last carbon check date cannot be a future date,അവസാന കാർബൺ പരിശോധന തീയതി ഭാവി തീയതിയായിരിക്കരുത്,
@@ -3921,7 +3915,6 @@
 Plaid public token error,പൊതു ടോക്കൺ പിശക്,
 Plaid transactions sync error,പ്ലെയ്ഡ് ഇടപാടുകൾ സമന്വയ പിശക്,
 Please check the error log for details about the import errors,ഇറക്കുമതി പിശകുകളെക്കുറിച്ചുള്ള വിശദാംശങ്ങൾക്കായി ദയവായി പിശക് ലോഗ് പരിശോധിക്കുക,
-Please click on the following link to set your new password,നിങ്ങളുടെ പുതിയ പാസ്വേഡ് സജ്ജീകരിക്കാൻ താഴെ നൽകിയിരിക്കുന്ന ലിങ്കിൽ ക്ലിക്ക് ദയവായി,
 Please create <b>DATEV Settings</b> for Company <b>{}</b>.,കമ്പനിക്കായി <b>DATEV ക്രമീകരണങ്ങൾ</b> സൃഷ്ടിക്കുക <b>{}</b> .,
 Please create adjustment Journal Entry for amount {0} ,തുക for 0 for ന് ക്രമീകരണം ജേണൽ എൻ‌ട്രി സൃഷ്‌ടിക്കുക,
 Please do not create more than 500 items at a time,ഒരു സമയം 500 ൽ കൂടുതൽ ഇനങ്ങൾ സൃഷ്ടിക്കരുത്,
@@ -3997,6 +3990,7 @@
 Release date must be in the future,റിലീസ് തീയതി ഭാവിയിൽ ആയിരിക്കണം,
 Relieving Date must be greater than or equal to Date of Joining,റിലീവിംഗ് തീയതി ചേരുന്ന തീയതിയെക്കാൾ വലുതോ തുല്യമോ ആയിരിക്കണം,
 Rename,പേരു്മാറ്റുക,
+Rename Not Allowed,പേരുമാറ്റുന്നത് അനുവദനീയമല്ല,
 Repayment Method is mandatory for term loans,ടേം ലോണുകൾക്ക് തിരിച്ചടവ് രീതി നിർബന്ധമാണ്,
 Repayment Start Date is mandatory for term loans,ടേം ലോണുകൾക്ക് തിരിച്ചടവ് ആരംഭ തീയതി നിർബന്ധമാണ്,
 Report Item,ഇനം റിപ്പോർട്ടുചെയ്യുക,
@@ -4043,7 +4037,6 @@
 Select All,എല്ലാം തിരഞ്ഞെടുക്കുക,
 Select Difference Account,വ്യത്യാസ അക്കൗണ്ട് തിരഞ്ഞെടുക്കുക,
 Select a Default Priority.,ഒരു സ്ഥിര മുൻ‌ഗണന തിരഞ്ഞെടുക്കുക.,
-Select a Supplier from the Default Supplier List of the items below.,ചുവടെയുള്ള ഇനങ്ങളുടെ സ്ഥിരസ്ഥിതി വിതരണക്കാരന്റെ പട്ടികയിൽ നിന്ന് ഒരു വിതരണക്കാരനെ തിരഞ്ഞെടുക്കുക.,
 Select a company,ഒരു കമ്പനി തിരഞ്ഞെടുക്കുക,
 Select finance book for the item {0} at row {1},{1 row വരിയിലെ {0 item ഇനത്തിനായി ധനകാര്യ പുസ്തകം തിരഞ്ഞെടുക്കുക,
 Select only one Priority as Default.,സ്ഥിരസ്ഥിതിയായി ഒരു മുൻ‌ഗണന മാത്രം തിരഞ്ഞെടുക്കുക.,
@@ -4247,7 +4240,6 @@
 Actual ,യഥാർത്ഥം,
 Add to cart,കാർട്ടിലേക്ക് ചേർക്കുക,
 Budget,ബജറ്റ്,
-Chart Of Accounts Importer,അക്കൗണ്ട് ഇറക്കുമതിക്കാരന്റെ ചാർട്ട്,
 Chart of Accounts,വരവ് ചെലവു കണക്കു പുസ്തകം,
 Customer database.,ഉപഭോക്തൃ ഡാറ്റാബേസ്.,
 Days Since Last order,കഴിഞ്ഞ ഓർഡർ നു ശേഷം ദിനങ്ങൾ,
@@ -4546,7 +4538,6 @@
 Check Supplier Invoice Number Uniqueness,വിതരണക്കാരൻ ഇൻവോയിസ് നമ്പർ അദ്വിതീയമാണ് പരിശോധിക്കുക,
 Make Payment via Journal Entry,ജേർണൽ എൻട്രി വഴി പേയ്മെന്റ് നിർമ്മിക്കുക,
 Unlink Payment on Cancellation of Invoice,ഇൻവോയ്സ് റദ്ദാക്കൽ പേയ്മെന്റ് അൺലിങ്കുചെയ്യുക,
-Unlink Advance Payment on Cancelation of Order,ഓർഡർ റദ്ദാക്കുന്നതിനെക്കുറിച്ചുള്ള അഡ്വാൻസ് പേയ്മെന്റ് അൺലിങ്ക് ചെയ്യുക,
 Book Asset Depreciation Entry Automatically,യാന്ത്രികമായി ബുക്ക് അസറ്റ് മൂല്യത്തകർച്ച എൻട്രി,
 Automatically Add Taxes and Charges from Item Tax Template,ഐറ്റം ടാക്സ് ടെംപ്ലേറ്റിൽ നിന്ന് നികുതികളും നിരക്കുകളും സ്വപ്രേരിതമായി ചേർക്കുക,
 Automatically Fetch Payment Terms,പേയ്‌മെന്റ് നിബന്ധനകൾ യാന്ത്രികമായി നേടുക,
@@ -4940,7 +4931,6 @@
 POS Customer Group,POS കസ്റ്റമർ ഗ്രൂപ്പ്,
 POS Field,POS ഫീൽഡ്,
 POS Item Group,POS ഇനം ഗ്രൂപ്പ്,
-[Select],[തിരഞ്ഞെടുക്കുക],
 Company Address,കമ്പനി വിലാസം,
 Update Stock,സ്റ്റോക്ക് അപ്ഡേറ്റ്,
 Ignore Pricing Rule,പ്രൈസിങ് റൂൾ അവഗണിക്കുക,
@@ -6481,7 +6471,6 @@
 Appraisal Template,അപ്രൈസൽ ഫലകം,
 For Employee Name,ജീവനക്കാരുടെ പേര് എന്ന,
 Goals,ലക്ഷ്യങ്ങൾ,
-Calculate Total Score,ആകെ സ്കോർ കണക്കുകൂട്ടുക,
 Total Score (Out of 5),(5) ആകെ സ്കോർ,
 "Any other remarks, noteworthy effort that should go in the records.","മറ്റേതെങ്കിലും പരാമർശമാണ്, റെക്കോർഡുകൾ ചെല്ലേണ്ടതിന്നു ശ്രദ്ധേയമാണ് ശ്രമം.",
 Appraisal Goal,മൂല്യനിർണയം ഗോൾ,
@@ -6599,11 +6588,6 @@
 Reason for Leaving,പോകാനുള്ള കാരണം,
 Leave Encashed?,കാശാക്കാം വിടണോ?,
 Encashment Date,ലീവ് തീയതി,
-Exit Interview Details,നിന്ന് പുറത്തുകടക്കുക അഭിമുഖം വിശദാംശങ്ങൾ,
-Held On,ന് നടക്കും,
-Reason for Resignation,രാജി കാരണം,
-Better Prospects,മെച്ചപ്പെട്ട സാദ്ധ്യതകളും,
-Health Concerns,ആരോഗ്യ ആശങ്കകൾ,
 New Workplace,പുതിയ ജോലിസ്ഥലം,
 HR-EAD-.YYYY.-,HR-EAD-. YYYY.-,
 Returned Amount,നൽകിയ തുക,
@@ -8239,9 +8223,6 @@
 Manufacturers used in Items,ഇനങ്ങൾ ഉപയോഗിക്കുന്ന മാനുഫാക്ചറേഴ്സ്,
 Limited to 12 characters,12 പ്രതീകങ്ങളായി ലിമിറ്റഡ്,
 MAT-MR-.YYYY.-,MAT-MR- .YYYY.-,
-Set Warehouse,വെയർഹ house സ് സജ്ജമാക്കുക,
-Sets 'For Warehouse' in each row of the Items table.,ഇനങ്ങളുടെ പട്ടികയിലെ ഓരോ വരിയിലും &#39;വെയർഹ house സിനായി&#39; സജ്ജമാക്കുന്നു.,
-Requested For,ഇൻവേർനോ,
 Partially Ordered,ഭാഗികമായി ഓർഡർ ചെയ്തു,
 Transferred,മാറ്റിയത്,
 % Ordered,% ക്രമപ്പെടുത്തിയ,
@@ -8690,8 +8671,6 @@
 Select warehouse for material requests,മെറ്റീരിയൽ അഭ്യർത്ഥനകൾക്കായി വെയർഹ house സ് തിരഞ്ഞെടുക്കുക,
 Transfer Materials For Warehouse {0},വെയർഹൗസിനായി മെറ്റീരിയലുകൾ കൈമാറുക {0},
 Production Plan Material Request Warehouse,പ്രൊഡക്ഷൻ പ്ലാൻ മെറ്റീരിയൽ അഭ്യർത്ഥന വെയർഹ house സ്,
-Set From Warehouse,വെയർഹൗസിൽ നിന്ന് സജ്ജമാക്കുക,
-Source Warehouse (Material Transfer),ഉറവിട വെയർഹ house സ് (മെറ്റീരിയൽ കൈമാറ്റം),
 Sets 'Source Warehouse' in each row of the items table.,ഇനങ്ങളുടെ പട്ടികയിലെ ഓരോ വരിയിലും &#39;ഉറവിട വെയർഹ house സ്&#39; സജ്ജമാക്കുന്നു.,
 Sets 'Target Warehouse' in each row of the items table.,ഇനങ്ങളുടെ പട്ടികയിലെ ഓരോ വരിയിലും &#39;ടാർ‌ഗെറ്റ് വെയർ‌ഹ house സ്&#39; സജ്ജമാക്കുന്നു.,
 Show Cancelled Entries,റദ്ദാക്കിയ എൻ‌ട്രികൾ കാണിക്കുക,
@@ -9157,7 +9136,6 @@
 Is Income Tax Component,ആദായനികുതി ഘടകമാണ്,
 Component properties and references ,ഘടക ഗുണങ്ങളും റഫറൻസുകളും,
 Additional Salary ,അധിക ശമ്പളം,
-Condtion and formula,അവസ്ഥയും സൂത്രവാക്യവും,
 Unmarked days,അടയാളപ്പെടുത്താത്ത ദിവസങ്ങൾ,
 Absent Days,ഇല്ലാത്ത ദിവസങ്ങൾ,
 Conditions and Formula variable and example,നിബന്ധനകളും ഫോർമുല വേരിയബിളും ഉദാഹരണവും,
@@ -9444,7 +9422,6 @@
 Please check your Plaid client ID and secret values,നിങ്ങളുടെ പ്ലെയ്ഡ് ക്ലയന്റ് ഐഡിയും രഹസ്യ മൂല്യങ്ങളും പരിശോധിക്കുക,
 Bank transaction creation error,ബാങ്ക് ഇടപാട് സൃഷ്ടിക്കൽ പിശക്,
 Unit of Measurement,അളവെടുക്കൽ യൂണിറ്റ്,
-Row #{}: Selling rate for item {} is lower than its {}. Selling rate should be atleast {},വരി # {}: item item ഇനത്തിന്റെ വിൽപ്പന നിരക്ക് അതിന്റെ than than നേക്കാൾ കുറവാണ്. വിൽപ്പന നിരക്ക് കുറഞ്ഞത് {} ആയിരിക്കണം,
 Fiscal Year {0} Does Not Exist,സാമ്പത്തിക വർഷം {0 Ex നിലവിലില്ല,
 Row # {0}: Returned Item {1} does not exist in {2} {3},വരി # {0}: നൽകിയ ഇനം {1} {2} {3 in ൽ നിലവിലില്ല,
 Valuation type charges can not be marked as Inclusive,മൂല്യനിർണ്ണയ തരം നിരക്കുകൾ ഉൾപ്പെടുത്തൽ എന്ന് അടയാളപ്പെടുത്താൻ കഴിയില്ല,
@@ -9598,8 +9575,60 @@
 Response Time for {0} priority in row {1} can't be greater than Resolution Time.,{1 row വരിയിലെ {0} മുൻ‌ഗണനയ്ക്കുള്ള പ്രതികരണ സമയം മിഴിവ് സമയത്തേക്കാൾ വലുതായിരിക്കരുത്.,
 {0} is not enabled in {1},{1 in ൽ {0} പ്രവർത്തനക്ഷമമാക്കിയിട്ടില്ല,
 Group by Material Request,മെറ്റീരിയൽ അഭ്യർത്ഥന പ്രകാരം ഗ്രൂപ്പ്,
-"Row {0}: For Supplier {0}, Email Address is Required to Send Email","വരി {0}: വിതരണക്കാരന് {0}, ഇമെയിൽ അയയ്ക്കാൻ ഇമെയിൽ വിലാസം ആവശ്യമാണ്",
 Email Sent to Supplier {0},ഇമെയിൽ വിതരണക്കാരന് അയച്ചു {0},
 "The Access to Request for Quotation From Portal is Disabled. To Allow Access, Enable it in Portal Settings.","പോർട്ടലിൽ നിന്നുള്ള ഉദ്ധരണിക്കുള്ള അഭ്യർത്ഥനയിലേക്കുള്ള ആക്‌സസ്സ് പ്രവർത്തനരഹിതമാക്കി. ആക്സസ് അനുവദിക്കുന്നതിന്, പോർട്ടൽ ക്രമീകരണങ്ങളിൽ ഇത് പ്രാപ്തമാക്കുക.",
 Supplier Quotation {0} Created,വിതരണ ഉദ്ധരണി {0} സൃഷ്ടിച്ചു,
 Valid till Date cannot be before Transaction Date,ഇടപാട് തീയതിക്ക് മുമ്പായി തീയതി വരെ സാധുവായിരിക്കില്ല,
+Unlink Advance Payment on Cancellation of Order,ഓർഡർ റദ്ദാക്കുന്നതിനുള്ള അഡ്വാൻസ് പേയ്മെന്റ് അൺലിങ്ക് ചെയ്യുക,
+"Simple Python Expression, Example: territory != 'All Territories'","ലളിതമായ പൈത്തൺ എക്സ്പ്രഷൻ, ഉദാഹരണം: പ്രദേശം! = &#39;എല്ലാ പ്രദേശങ്ങളും&#39;",
+Sales Contributions and Incentives,വിൽപ്പന സംഭാവനകളും പ്രോത്സാഹനങ്ങളും,
+Sourced by Supplier,ഉറവിടം നൽകിയത്,
+Total weightage assigned should be 100%.<br>It is {0},നിയുക്തമാക്കിയ ആകെ വെയിറ്റേജ് 100% ആയിരിക്കണം.<br> ഇത് {0 is ആണ്,
+Account {0} exists in parent company {1}.,പാരന്റ് കമ്പനി {1 in ൽ അക്കൗണ്ട് {0} നിലവിലുണ്ട്.,
+"To overrule this, enable '{0}' in company {1}","ഇത് അസാധുവാക്കാൻ, company {company കമ്പനിയിൽ &#39;{0}&#39; പ്രവർത്തനക്ഷമമാക്കുക",
+Invalid condition expression,കണ്ടീഷൻ എക്‌സ്‌പ്രഷൻ അസാധുവാണ്,
+Please Select a Company First,ആദ്യം ഒരു കമ്പനി തിരഞ്ഞെടുക്കുക,
+Please Select Both Company and Party Type First,"ആദ്യം കമ്പനി, പാർട്ടി തരം എന്നിവ തിരഞ്ഞെടുക്കുക",
+Provide the invoice portion in percent,ഇൻവോയ്സ് ഭാഗം ശതമാനത്തിൽ നൽകുക,
+Give number of days according to prior selection,മുൻ തിരഞ്ഞെടുപ്പ് അനുസരിച്ച് ദിവസങ്ങളുടെ എണ്ണം നൽകുക,
+Email Details,ഇമെയിൽ വിശദാംശങ്ങൾ,
+"Select a greeting for the receiver. E.g. Mr., Ms., etc.","സ്വീകർത്താവിന് ഒരു അഭിവാദ്യം തിരഞ്ഞെടുക്കുക. ഉദാ. മിസ്റ്റർ, മിസ്, മുതലായവ.",
+Preview Email,ഇമെയിൽ പ്രിവ്യൂ ചെയ്യുക,
+Please select a Supplier,ഒരു വിതരണക്കാരനെ തിരഞ്ഞെടുക്കുക,
+Supplier Lead Time (days),വിതരണക്കാരന്റെ ലീഡ് സമയം (ദിവസം),
+"Home, Work, etc.","വീട്, ജോലി തുടങ്ങിയവ.",
+Exit Interview Held On,പുറത്തുകടന്ന അഭിമുഖം ഓണാണ്,
+Condition and formula,അവസ്ഥയും സൂത്രവാക്യവും,
+Sets 'Target Warehouse' in each row of the Items table.,ഇനങ്ങളുടെ പട്ടികയിലെ ഓരോ വരിയിലും &#39;ടാർ‌ഗെറ്റ് വെയർ‌ഹ house സ്&#39; സജ്ജമാക്കുന്നു.,
+Sets 'Source Warehouse' in each row of the Items table.,ഇനങ്ങളുടെ പട്ടികയിലെ ഓരോ വരിയിലും &#39;ഉറവിട വെയർഹ house സ്&#39; സജ്ജമാക്കുന്നു.,
+POS Register,POS രജിസ്റ്റർ,
+"Can not filter based on POS Profile, if grouped by POS Profile",POS പ്രൊഫൈൽ അനുസരിച്ച് ഗ്രൂപ്പുചെയ്യുകയാണെങ്കിൽ POS പ്രൊഫൈലിനെ അടിസ്ഥാനമാക്കി ഫിൽട്ടർ ചെയ്യാൻ കഴിയില്ല,
+"Can not filter based on Customer, if grouped by Customer",കസ്റ്റമർ ഗ്രൂപ്പുചെയ്‌താൽ ഉപഭോക്താവിനെ അടിസ്ഥാനമാക്കി ഫിൽട്ടർ ചെയ്യാൻ കഴിയില്ല,
+"Can not filter based on Cashier, if grouped by Cashier",കാഷ്യർ ഗ്രൂപ്പുചെയ്‌തിട്ടുണ്ടെങ്കിൽ കാഷ്യറിനെ അടിസ്ഥാനമാക്കി ഫിൽട്ടർ ചെയ്യാൻ കഴിയില്ല,
+Payment Method,പണംകൊടുക്കൽരീതി,
+"Can not filter based on Payment Method, if grouped by Payment Method",പേയ്‌മെന്റ് രീതി അനുസരിച്ച് ഗ്രൂപ്പുചെയ്‌താൽ പേയ്‌മെന്റ് രീതിയെ അടിസ്ഥാനമാക്കി ഫിൽട്ടർ ചെയ്യാൻ കഴിയില്ല,
+Supplier Quotation Comparison,വിതരണ ഉദ്ധരണി താരതമ്യം,
+Price per Unit (Stock UOM),യൂണിറ്റിന് വില (സ്റ്റോക്ക് യു‌എം),
+Group by Supplier,വിതരണക്കാരന്റെ ഗ്രൂപ്പ്,
+Group by Item,ഇനം അനുസരിച്ച് ഗ്രൂപ്പ്,
+Remember to set {field_label}. It is required by {regulation}.,{Field_label set സജ്ജമാക്കാൻ ഓർമ്മിക്കുക. ഇത് {നിയന്ത്രണം by ആവശ്യമാണ്.,
+Enrollment Date cannot be before the Start Date of the Academic Year {0},എൻറോൾമെന്റ് തീയതി അക്കാദമിക് വർഷത്തിന്റെ ആരംഭ തീയതിക്ക് മുമ്പായിരിക്കരുത് {0},
+Enrollment Date cannot be after the End Date of the Academic Term {0},എൻ‌റോൾ‌മെന്റ് തീയതി {0 the അക്കാദമിക് ടേമിന്റെ അവസാന തീയതിക്ക് ശേഷം ആയിരിക്കരുത്,
+Enrollment Date cannot be before the Start Date of the Academic Term {0},എൻറോൾമെന്റ് തീയതി അക്കാദമിക് കാലാവധിയുടെ ആരംഭ തീയതിക്ക് മുമ്പായിരിക്കരുത് {0},
+Posting future transactions are not allowed due to Immutable Ledger,മാറ്റമില്ലാത്ത ലെഡ്ജർ കാരണം ഭാവിയിലെ ഇടപാടുകൾ പോസ്റ്റുചെയ്യുന്നത് അനുവദനീയമല്ല,
+Future Posting Not Allowed,ഭാവിയിലെ പോസ്റ്റിംഗ് അനുവദനീയമല്ല,
+"To enable Capital Work in Progress Accounting, ","പ്രോഗ്രസ് അക്കൗണ്ടിംഗിൽ ക്യാപിറ്റൽ വർക്ക് പ്രാപ്തമാക്കുന്നതിന്,",
+you must select Capital Work in Progress Account in accounts table,അക്കൗണ്ട് പട്ടികയിലെ പ്രോഗ്രസ് അക്ക In ണ്ടിലെ ക്യാപിറ്റൽ വർക്ക് തിരഞ്ഞെടുക്കണം,
+You can also set default CWIP account in Company {},കമ്പനി} in ൽ നിങ്ങൾക്ക് സ്ഥിരസ്ഥിതി CWIP അക്ക set ണ്ട് സജ്ജമാക്കാനും കഴിയും,
+The Request for Quotation can be accessed by clicking on the following button,ഇനിപ്പറയുന്ന ബട്ടണിൽ ക്ലിക്കുചെയ്ത് ഉദ്ധരണിക്കായുള്ള അഭ്യർത്ഥന ആക്സസ് ചെയ്യാൻ കഴിയും,
+Regards,ആദരവോടെ,
+Please click on the following button to set your new password,നിങ്ങളുടെ പുതിയ പാസ്‌വേഡ് സജ്ജീകരിക്കുന്നതിന് ഇനിപ്പറയുന്ന ബട്ടണിൽ ക്ലിക്കുചെയ്യുക,
+Update Password,പാസ്‌വേഡ് അപ്‌ഡേറ്റുചെയ്യുക,
+Row #{}: Selling rate for item {} is lower than its {}. Selling {} should be atleast {},വരി # {}: item item ഇനത്തിന്റെ വിൽപ്പന നിരക്ക് അതിന്റെ than than നേക്കാൾ കുറവാണ്. {} വിൽക്കുന്നത് കുറഞ്ഞത് ആയിരിക്കണം}},
+You can alternatively disable selling price validation in {} to bypass this validation.,ഈ മൂല്യനിർണ്ണയം മറികടക്കാൻ നിങ്ങൾക്ക് {in എന്ന വിലയിൽ വിൽപ്പന വിലനിർണ്ണയം അപ്രാപ്‌തമാക്കാൻ കഴിയും.,
+Invalid Selling Price,വിൽപ്പന വില അസാധുവാണ്,
+Address needs to be linked to a Company. Please add a row for Company in the Links table.,വിലാസം ഒരു കമ്പനിയുമായി ലിങ്കുചെയ്യേണ്ടതുണ്ട്. ലിങ്കുകൾ പട്ടികയിൽ കമ്പനിക്കായി ഒരു വരി ചേർക്കുക.,
+Company Not Linked,കമ്പനി ലിങ്കുചെയ്തിട്ടില്ല,
+Import Chart of Accounts from CSV / Excel files,CSV / Excel ഫയലുകളിൽ നിന്ന് അക്ക of ണ്ടുകളുടെ ചാർട്ട് ഇറക്കുമതി ചെയ്യുക,
+Completed Qty cannot be greater than 'Qty to Manufacture',പൂർ‌ത്തിയാക്കിയ ക്യൂട്ടി &#39;ക്യൂട്ടി ടു മാനുഫാക്ചറി&#39;നേക്കാൾ‌ കൂടുതലാകരുത്,
+"Row {0}: For Supplier {1}, Email Address is Required to send an email","വരി {0}: വിതരണക്കാരന് {1}, ഒരു ഇമെയിൽ അയയ്ക്കാൻ ഇമെയിൽ വിലാസം ആവശ്യമാണ്",
diff --git a/erpnext/translations/mr.csv b/erpnext/translations/mr.csv
index 6310181..ab688c7 100644
--- a/erpnext/translations/mr.csv
+++ b/erpnext/translations/mr.csv
@@ -521,7 +521,6 @@
 Chargeble,चार्ज करण्यायोग्य,
 Charges are updated in Purchase Receipt against each item,शुल्क प्रत्येक आयटम विरुद्ध खरेदी पावती मध्ये अद्यतनित केले जातात,
 "Charges will be distributed proportionately based on item qty or amount, as per your selection",शुल्क प्रमाणातील आपल्या  निवडीनुसार आयटम प्रमाण किंवा रक्कम आधारित वाटप केले जाणार आहे,
-Chart Of Accounts,लेखा चार्ट,
 Chart of Cost Centers,कॉस्ट केंद्रे चार्ट,
 Check all,सर्व चेक करा,
 Checkout,चेकआऊट,
@@ -581,7 +580,6 @@
 Compensatory Off,भरपाई देणारा बंद,
 Compensatory leave request days not in valid holidays,वैध सुट्ट्या नसलेल्या सूट देण्याच्या रजेची विनंती दिवस,
 Complaint,तक्रार,
-Completed Qty can not be greater than 'Qty to Manufacture',पूर्ण Qty  'Qty निर्मिती करण्या ' पेक्षा जास्त असू शकत नाही,
 Completion Date,पूर्ण तारीख,
 Computer,संगणक,
 Condition,अट,
@@ -2033,7 +2031,6 @@
 Please select Charge Type first,कृपया   पहिले शुल्क प्रकार निवडा,
 Please select Company,कृपया कंपनी निवडा,
 Please select Company and Designation,कृपया कंपनी आणि पदनाम निवडा,
-Please select Company and Party Type first,कृपया पहिले कंपनी आणि पक्षाचे प्रकार निवडा,
 Please select Company and Posting Date to getting entries,कृपया नोंदणीसाठी कंपनी आणि पोस्टिंग तारीख निवडा,
 Please select Company first,कृपया पहिले कंपनी निवडा,
 Please select Completion Date for Completed Asset Maintenance Log,पूर्ण संपत्तीची पूर्तता कराराची पूर्ण तारीख निवडा,
@@ -2980,7 +2977,6 @@
 The name of your company for which you are setting up this system.,"आपल्या कंपनीचे नाव, जे आपण या प्रणालीत  सेट केले  आहे.",
 The number of shares and the share numbers are inconsistent,शेअर्सची संख्या आणि शेअरची संख्या विसंगत आहेत,
 The payment gateway account in plan {0} is different from the payment gateway account in this payment request,योजना {0} मधील देयक गेटवे खाते या देयक विनंतीमध्ये देयक गेटवे खात्यापेक्षा वेगळे आहे,
-The request for quotation can be accessed by clicking on the following link,अवतरण विनंती खालील लिंक वर क्लिक करून प्रवेश करणे शक्य,
 The selected BOMs are not for the same item,निवडलेले BOMs सारख्या आयटमसाठी  नाहीत,
 The selected item cannot have Batch,निवडलेले आयटमला  बॅच असू शकत नाही,
 The seller and the buyer cannot be the same,विक्रेता आणि खरेदीदार समान असू शकत नाही,
@@ -3130,7 +3126,6 @@
 Total flexible benefit component amount {0} should not be less than max benefits {1},एकूण लवचिक लाभ घटक रक्कम {0} कमाल फायद्यांपेक्षा कमी नसावी {1},
 Total hours: {0},एकूण तास: {0},
 Total leaves allocated is mandatory for Leave Type {0},राखीव प्रकारानुसार {0} वाटप केलेले एकूण पाने अनिवार्य आहेत.,
-Total weightage assigned should be 100%. It is {0},एकूण नियुक्त वजन 100% असावे. हे  {0} आहे,
 Total working hours should not be greater than max working hours {0},एकूण कामाचे तास कमाल कामाचे तास पेक्षा जास्त असू नये {0},
 Total {0} ({1}),एकूण {0} ({1}),
 "Total {0} for all items is zero, may be you should change 'Distribute Charges Based On'","एकूण {0} सर्व आयटम शून्य आहे, आपण &#39;वर आधारित शुल्क वितरण&#39; बदलू पाहिजे",
@@ -3544,7 +3539,6 @@
 Company field is required,कंपनी फील्ड आवश्यक आहे,
 Creating Dimensions...,परिमाण तयार करीत आहे ...,
 Duplicate entry against the item code {0} and manufacturer {1},आयटम कोड {0} आणि निर्मात्याच्या विरूद्ध डुप्लीकेट एंट्री {1},
-Import Chart Of Accounts from CSV / Excel files,सीएसव्ही / एक्सेल फायलींवरून खात्यांचा चार्ट आयात करा,
 Invalid GSTIN! The input you've entered doesn't match the GSTIN format for UIN Holders or Non-Resident OIDAR Service Providers,अवैध जीएसटीआयएन! आपण प्रविष्ट केलेले इनपुट यूआयएन धारक किंवा अनिवासी ओआयडीएआर सेवा प्रदात्यांसाठी जीएसटीआयएन स्वरूपनाशी जुळत नाही,
 Invoice Grand Total,बीजक एकूण,
 Last carbon check date cannot be a future date,शेवटची कार्बन चेक तारीख भविष्यातील तारीख असू शकत नाही,
@@ -3921,7 +3915,6 @@
 Plaid public token error,प्लेड सार्वजनिक टोकन त्रुटी,
 Plaid transactions sync error,प्लेड व्यवहार समक्रमण त्रुटी,
 Please check the error log for details about the import errors,कृपया आयात त्रुटींबद्दल तपशीलांसाठी त्रुटी लॉग तपासा,
-Please click on the following link to set your new password,तुमचा नवीन पासवर्ड सेट करण्यासाठी खालील दुव्यावर क्लिक करा,
 Please create <b>DATEV Settings</b> for Company <b>{}</b>.,<b>}</b> कंपनी <b>DATEV सेटिंग्ज</b> <b>{तयार</b> करा.,
 Please create adjustment Journal Entry for amount {0} ,कृपया रक्कम for 0 amount साठी समायोजन जर्नल एन्ट्री तयार करा,
 Please do not create more than 500 items at a time,कृपया एकावेळी 500 हून अधिक वस्तू तयार करु नका,
@@ -3997,6 +3990,7 @@
 Release date must be in the future,रीलिझ तारीख भविष्यात असणे आवश्यक आहे,
 Relieving Date must be greater than or equal to Date of Joining,सामील होण्याची तारीख सामील होण्याच्या तारखेच्या किंवा त्याहून अधिक असणे आवश्यक आहे,
 Rename,पुनर्नामित करा,
+Rename Not Allowed,पुनर्नामित अनुमत नाही,
 Repayment Method is mandatory for term loans,मुदतीच्या कर्जासाठी परतफेड करण्याची पद्धत अनिवार्य आहे,
 Repayment Start Date is mandatory for term loans,मुदतीच्या कर्जासाठी परतफेड सुरू करण्याची तारीख अनिवार्य आहे,
 Report Item,आयटम नोंदवा,
@@ -4043,7 +4037,6 @@
 Select All,सर्व निवडा,
 Select Difference Account,फरक खाते निवडा,
 Select a Default Priority.,डीफॉल्ट अग्रक्रम निवडा.,
-Select a Supplier from the Default Supplier List of the items below.,खालील बाबींच्या डीफॉल्ट सप्लायर यादीमधून एक पुरवठादार निवडा.,
 Select a company,कंपनी निवडा,
 Select finance book for the item {0} at row {1},पंक्ती {1} वर {0 the आयटमसाठी वित्त पुस्तक निवडा,
 Select only one Priority as Default.,डीफॉल्ट म्हणून केवळ एक अग्रक्रम निवडा.,
@@ -4247,7 +4240,6 @@
 Actual ,वास्तविक,
 Add to cart,सूचीत टाका,
 Budget,अर्थसंकल्प,
-Chart Of Accounts Importer,लेखा आयातकर्ता चार्ट,
 Chart of Accounts,खात्याचे चार्ट,
 Customer database.,ग्राहक डेटाबेस,
 Days Since Last order,गेल्या ऑर्डर असल्याने दिवस,
@@ -4546,7 +4538,6 @@
 Check Supplier Invoice Number Uniqueness,चेक पुरवठादार चलन क्रमांक वैशिष्ट्य,
 Make Payment via Journal Entry,जर्नल प्रवेश द्वारे रक्कम,
 Unlink Payment on Cancellation of Invoice,चलन रद्द देयक दुवा रद्द करा,
-Unlink Advance Payment on Cancelation of Order,ऑर्डर रद्द झाल्यावर अनलिंक अ‍ॅडव्हान्स पेमेंट,
 Book Asset Depreciation Entry Automatically,पुस्तक मालमत्ता घसारा प्रवेश स्वयंचलितपणे,
 Automatically Add Taxes and Charges from Item Tax Template,आयटम कर टेम्पलेटमधून स्वयंचलितपणे कर आणि शुल्क जोडा,
 Automatically Fetch Payment Terms,देय अटी स्वयंचलितपणे मिळवा,
@@ -4940,7 +4931,6 @@
 POS Customer Group,POS ग्राहक गट,
 POS Field,पॉस फील्ड,
 POS Item Group,POS बाबींचा गट,
-[Select],[निवडा],
 Company Address,कंपनीचा पत्ता,
 Update Stock,अद्यतन शेअर,
 Ignore Pricing Rule,किंमत नियम दुर्लक्ष करा,
@@ -6481,7 +6471,6 @@
 Appraisal Template,मूल्यांकन साचा,
 For Employee Name,कर्मचारी नावासाठी,
 Goals,गोल,
-Calculate Total Score,एकूण धावसंख्या गणना,
 Total Score (Out of 5),(5 पैकी) एकूण धावसंख्या,
 "Any other remarks, noteworthy effort that should go in the records.","इतर कोणताही अभिप्राय, रेकॉर्ड जावे की लक्षात घेण्याजोगा प्रयत्न.",
 Appraisal Goal,मूल्यांकन लक्ष्य,
@@ -6599,11 +6588,6 @@
 Reason for Leaving,सोडण्यासाठी  कारण,
 Leave Encashed?,रजा  मिळविता?,
 Encashment Date,एनकॅशमेंट तारीख,
-Exit Interview Details,मुलाखत तपशीलाच्या बाहेर पडा,
-Held On,आयोजित रोजी,
-Reason for Resignation,राजीनाम्याचे  कारण,
-Better Prospects,उत्तम प्रॉस्पेक्ट,
-Health Concerns,आरोग्य समस्यांसाठी,
 New Workplace,नवीन कामाची जागा,
 HR-EAD-.YYYY.-,एचआर-ईएडी- .YYY.-,
 Returned Amount,परत केलेली रक्कम,
@@ -8239,9 +8223,6 @@
 Manufacturers used in Items,आयटम मधे  वापरलेले  उत्पादक,
 Limited to 12 characters,12 वर्णांपर्यंत  मर्यादित,
 MAT-MR-.YYYY.-,मॅट-एमआर-.YYY.-,
-Set Warehouse,गोदाम सेट करा,
-Sets 'For Warehouse' in each row of the Items table.,आयटम सारणीच्या प्रत्येक पंक्तीमध्ये &#39;वेअरहाऊससाठी&#39; सेट करा.,
-Requested For,विनंती,
 Partially Ordered,अर्धवट आदेश दिले,
 Transferred,हस्तांतरित,
 % Ordered,% आदेश दिले,
@@ -8690,8 +8671,6 @@
 Select warehouse for material requests,भौतिक विनंत्यांसाठी गोदाम निवडा,
 Transfer Materials For Warehouse {0},वेअरहाउस {0 For साठी सामग्री हस्तांतरित करा,
 Production Plan Material Request Warehouse,उत्पादन योजना सामग्री विनंती वखार,
-Set From Warehouse,गोदामातून सेट करा,
-Source Warehouse (Material Transfer),स्त्रोत वखार (साहित्य हस्तांतरण),
 Sets 'Source Warehouse' in each row of the items table.,आयटम सारणीच्या प्रत्येक पंक्तीमध्ये &#39;सोर्स वेअरहाउस&#39; सेट करा.,
 Sets 'Target Warehouse' in each row of the items table.,आयटम सारणीच्या प्रत्येक पंक्तीमध्ये &#39;लक्ष्य वेअरहाउस&#39; सेट करा.,
 Show Cancelled Entries,रद्द नोंदी दर्शवा,
@@ -9157,7 +9136,6 @@
 Is Income Tax Component,आयकर घटक आहे,
 Component properties and references ,घटक गुणधर्म आणि संदर्भ,
 Additional Salary ,अतिरिक्त वेतन,
-Condtion and formula,स्थिती आणि सूत्र,
 Unmarked days,चिन्हांकित केलेले दिवस,
 Absent Days,अनुपस्थित दिवस,
 Conditions and Formula variable and example,अटी आणि फॉर्म्युला व्हेरिएबल आणि उदाहरण,
@@ -9444,7 +9422,6 @@
 Please check your Plaid client ID and secret values,कृपया आपला प्लेड क्लायंट आयडी आणि गुप्त मूल्ये तपासा,
 Bank transaction creation error,बँक व्यवहार निर्मिती त्रुटी,
 Unit of Measurement,मोजण्याचे एकक,
-Row #{}: Selling rate for item {} is lower than its {}. Selling rate should be atleast {},पंक्ती # {}: आयटम Se for साठी विक्री दर त्याच्या {than पेक्षा कमी आहे. विक्री दर कमीतकमी असावा} should,
 Fiscal Year {0} Does Not Exist,आथिर्क वर्ष {0} विद्यमान नाही,
 Row # {0}: Returned Item {1} does not exist in {2} {3},पंक्ती # {0}: परत केलेला आयटम {1 {{2} {3 in मध्ये विद्यमान नाही,
 Valuation type charges can not be marked as Inclusive,मूल्यमापन शुल्कास समावेशक म्हणून चिन्हांकित केले जाऊ शकत नाही,
@@ -9598,8 +9575,60 @@
 Response Time for {0} priority in row {1} can't be greater than Resolution Time.,पंक्ती} 1} मध्ये अग्रक्रम for 0 Resp साठी प्रतिसाद वेळ रिजोल्यूशन वेळेपेक्षा जास्त असू शकत नाही.,
 {0} is not enabled in {1},{1} मध्ये {0 enabled सक्षम केलेले नाही,
 Group by Material Request,मटेरियल रिक्वेस्टनुसार ग्रुप,
-"Row {0}: For Supplier {0}, Email Address is Required to Send Email","पंक्ती {0}: पुरवठादार {0} साठी, ईमेल पाठविण्यासाठी ईमेल पत्ता आवश्यक आहे",
 Email Sent to Supplier {0},पुरवठाकर्त्यास ईमेल पाठविला {0},
 "The Access to Request for Quotation From Portal is Disabled. To Allow Access, Enable it in Portal Settings.","पोर्टलवरील कोटेशन विनंतीसाठी प्रवेश अक्षम केला आहे. प्रवेशास अनुमती देण्यासाठी, पोर्टल सेटिंग्जमध्ये सक्षम करा.",
 Supplier Quotation {0} Created,पुरवठादार कोटेशन {0. तयार केले,
 Valid till Date cannot be before Transaction Date,तारखेपर्यंत वैध व्यवहार तारखेपूर्वी असू शकत नाहीत,
+Unlink Advance Payment on Cancellation of Order,ऑर्डर रद्द केल्यावर आगाऊ भरणा अनलिंक करा,
+"Simple Python Expression, Example: territory != 'All Territories'","साधे पायथन अभिव्यक्ति, उदाहरण: प्रदेश! = &#39;सर्व प्रदेश&#39;",
+Sales Contributions and Incentives,विक्री योगदान आणि प्रोत्साहन,
+Sourced by Supplier,पुरवठादार आंबट,
+Total weightage assigned should be 100%.<br>It is {0},नियुक्त केलेले एकूण वजन 100% असावे.<br> हे {0} आहे,
+Account {0} exists in parent company {1}.,मूळ कंपनी in 1} मध्ये खाते {0} विद्यमान आहे.,
+"To overrule this, enable '{0}' in company {1}",यावर आरोप करण्यासाठी कंपनी company 1} मध्ये &#39;{0}&#39; सक्षम करा,
+Invalid condition expression,अवैध स्थिती अभिव्यक्ती,
+Please Select a Company First,कृपया प्रथम एखादी कंपनी निवडा,
+Please Select Both Company and Party Type First,कृपया प्रथम कंपनी आणि पार्टी प्रकार दोन्ही निवडा,
+Provide the invoice portion in percent,पावत्याचा भाग टक्केवारीत द्या,
+Give number of days according to prior selection,पूर्वीच्या निवडीनुसार दिवसांची संख्या द्या,
+Email Details,ईमेल तपशील,
+"Select a greeting for the receiver. E.g. Mr., Ms., etc.","प्राप्तकर्त्यासाठी अभिवादन निवडा. उदा. श्री. कु., इ.",
+Preview Email,पूर्वावलोकन ईमेल,
+Please select a Supplier,कृपया एक पुरवठादार निवडा,
+Supplier Lead Time (days),पुरवठादार लीड वेळ (दिवस),
+"Home, Work, etc.","घर, कार्य इ.",
+Exit Interview Held On,बाहेर पडा मुलाखत,
+Condition and formula,अट आणि सूत्र,
+Sets 'Target Warehouse' in each row of the Items table.,आयटम सारणीच्या प्रत्येक पंक्तीमध्ये &#39;लक्ष्य वेअरहाउस&#39; सेट करा.,
+Sets 'Source Warehouse' in each row of the Items table.,आयटम सारणीच्या प्रत्येक पंक्तीमध्ये &#39;सोर्स वेअरहाउस&#39; सेट करा.,
+POS Register,पॉस नोंदणी,
+"Can not filter based on POS Profile, if grouped by POS Profile","पॉस प्रोफाइलद्वारे गटबद्ध केलेले असल्यास, पॉस प्रोफाइलवर आधारित फिल्टर करू शकत नाही",
+"Can not filter based on Customer, if grouped by Customer","ग्राहकानुसार गटबद्ध केल्यास, ग्राहकाच्या आधारे फिल्टर करू शकत नाही",
+"Can not filter based on Cashier, if grouped by Cashier",कॅशियरद्वारे ग्रुप केलेले असल्यास कॅशियरच्या आधारे फिल्‍टर करणे शक्य नाही,
+Payment Method,देय द्यायची पद्धत,
+"Can not filter based on Payment Method, if grouped by Payment Method","देयक पद्धतीनुसार गटबद्ध केल्यास, देयक पद्धतीवर आधारित फिल्टर करू शकत नाही",
+Supplier Quotation Comparison,पुरवठादार कोटेशन तुलना,
+Price per Unit (Stock UOM),प्रति युनिट किंमत (स्टॉक यूओएम),
+Group by Supplier,पुरवठादार गट,
+Group by Item,आयटमनुसार गट,
+Remember to set {field_label}. It is required by {regulation}.,{फील्ड_ लेबल set सेट करणे लक्षात ठेवा. हे {नियमन by द्वारे आवश्यक आहे.,
+Enrollment Date cannot be before the Start Date of the Academic Year {0},नावनोंदणीची तारीख शैक्षणिक वर्षाच्या प्रारंभ तारखेच्या आधी असू शकत नाही {0},
+Enrollment Date cannot be after the End Date of the Academic Term {0},नावनोंदणीची तारीख शैक्षणिक मुदतीच्या अंतिम तारखेनंतर असू शकत नाही {0},
+Enrollment Date cannot be before the Start Date of the Academic Term {0},नावनोंदणीची तारीख शैक्षणिक मुदतीच्या प्रारंभ तारखेच्या आधीची असू शकत नाही {0},
+Posting future transactions are not allowed due to Immutable Ledger,अपरिवर्तनीय लेजरमुळे भविष्यातील व्यवहार पोस्ट करण्यास परवानगी नाही,
+Future Posting Not Allowed,भविष्यातील पोस्टिंगला परवानगी नाही,
+"To enable Capital Work in Progress Accounting, ","प्रगती लेखामध्ये भांडवल कार्य सक्षम करण्यासाठी,",
+you must select Capital Work in Progress Account in accounts table,आपण अकाउंट्स टेबलमध्ये कॅपिटल वर्क इन प्रोग्रेस अकाउंट निवडणे आवश्यक आहे,
+You can also set default CWIP account in Company {},आपण कंपनी default default मध्ये डीफॉल्ट CWIP खाते देखील सेट करू शकता.,
+The Request for Quotation can be accessed by clicking on the following button,खाली दिलेल्या बटणावर क्लिक करून कोटेशन विनंतीसाठी प्रवेश केला जाऊ शकतो,
+Regards,साभार,
+Please click on the following button to set your new password,कृपया आपला नवीन संकेतशब्द सेट करण्यासाठी खालील बटणावर क्लिक करा,
+Update Password,संकेतशब्द अद्यतनित करा,
+Row #{}: Selling rate for item {} is lower than its {}. Selling {} should be atleast {},पंक्ती # {}: आयटम Se for साठी विक्री दर त्याच्या {than पेक्षा कमी आहे. {Lling विक्री कमीतकमी असावी {},
+You can alternatively disable selling price validation in {} to bypass this validation.,आपण हे वैधता बायपास करण्यासाठी वैकल्पिकरित्या विक्री मूल्य प्रमाणीकरण {in मध्ये अक्षम करू शकता.,
+Invalid Selling Price,अवैध विक्री किंमत,
+Address needs to be linked to a Company. Please add a row for Company in the Links table.,पत्त्याचा कंपनीशी दुवा साधणे आवश्यक आहे. कृपया दुवे सारणीमध्ये कंपनीसाठी एक पंक्ती जोडा.,
+Company Not Linked,कंपनी दुवा साधलेली नाही,
+Import Chart of Accounts from CSV / Excel files,सीएसव्ही / एक्सेल फायलींवरून खात्यांचा चार्ट चार्ट आयात करा,
+Completed Qty cannot be greater than 'Qty to Manufacture',पूर्ण केलेली क्वाटीटी &#39;क्वाटी टू मॅन्युफॅक्चरिंग&#39; पेक्षा मोठी असू शकत नाही,
+"Row {0}: For Supplier {1}, Email Address is Required to send an email","पंक्ती {0}: पुरवठादार {1} साठी, ईमेल पाठविण्यासाठी ईमेल पत्ता आवश्यक आहे",
diff --git a/erpnext/translations/ms.csv b/erpnext/translations/ms.csv
index 4b25177..fddea48 100644
--- a/erpnext/translations/ms.csv
+++ b/erpnext/translations/ms.csv
@@ -521,7 +521,6 @@
 Chargeble,Chargeble,
 Charges are updated in Purchase Receipt against each item,Caj akan dikemas kini di Resit Pembelian terhadap setiap item,
 "Charges will be distributed proportionately based on item qty or amount, as per your selection","Caj akan diagihkan mengikut kadar berdasarkan item qty atau amaunnya, seperti pilihan anda",
-Chart Of Accounts,Carta Akaun,
 Chart of Cost Centers,Carta Pusat Kos,
 Check all,Memeriksa semua,
 Checkout,Checkout,
@@ -581,7 +580,6 @@
 Compensatory Off,Pampasan Off,
 Compensatory leave request days not in valid holidays,Hari permintaan cuti pampasan tidak bercuti,
 Complaint,Aduan,
-Completed Qty can not be greater than 'Qty to Manufacture',Siap Qty tidak boleh lebih besar daripada &#39;Kuantiti untuk Pengeluaran&#39;,
 Completion Date,Tarikh Siap,
 Computer,Komputer,
 Condition,Keadaan,
@@ -2033,7 +2031,6 @@
 Please select Charge Type first,Sila pilih Jenis Caj pertama,
 Please select Company,Sila pilih Syarikat,
 Please select Company and Designation,Sila pilih Syarikat dan Jawatan,
-Please select Company and Party Type first,Sila pilih Syarikat dan Parti Jenis pertama,
 Please select Company and Posting Date to getting entries,Sila pilih Syarikat dan Tarikh Penghantaran untuk mendapatkan entri,
 Please select Company first,Sila pilih Syarikat pertama,
 Please select Completion Date for Completed Asset Maintenance Log,Sila pilih Tarikh Siap untuk Log Penyelenggaraan Aset Selesai,
@@ -2980,7 +2977,6 @@
 The name of your company for which you are setting up this system.,Nama syarikat anda yang mana anda menubuhkan sistem ini.,
 The number of shares and the share numbers are inconsistent,Bilangan saham dan bilangan saham tidak konsisten,
 The payment gateway account in plan {0} is different from the payment gateway account in this payment request,Akaun gerbang pembayaran dalam pelan {0} adalah berbeza daripada akaun gerbang pembayaran dalam permintaan pembayaran ini,
-The request for quotation can be accessed by clicking on the following link,Permintaan untuk sebutharga boleh diakses dengan klik pada pautan berikut,
 The selected BOMs are not for the same item,The boms dipilih bukan untuk item yang sama,
 The selected item cannot have Batch,Item yang dipilih tidak boleh mempunyai Batch,
 The seller and the buyer cannot be the same,Penjual dan pembeli tidak boleh sama,
@@ -3130,7 +3126,6 @@
 Total flexible benefit component amount {0} should not be less than max benefits {1},Jumlah komponen faedah fleksibel {0} tidak boleh kurang daripada faedah max {1},
 Total hours: {0},Jumlah jam: {0},
 Total leaves allocated is mandatory for Leave Type {0},Jumlah daun yang diperuntukkan adalah wajib untuk Jenis Tinggalkan {0},
-Total weightage assigned should be 100%. It is {0},Jumlah wajaran yang diberikan harus 100%. Ia adalah {0},
 Total working hours should not be greater than max working hours {0},Jumlah jam kerja tidak harus lebih besar daripada waktu kerja max {0},
 Total {0} ({1}),Jumlah {0} ({1}),
 "Total {0} for all items is zero, may be you should change 'Distribute Charges Based On'","Jumlah {0} untuk semua barangan adalah sifar, mungkin anda perlu menukar &#39;Mengedarkan Caj Berasaskan&#39;",
@@ -3544,7 +3539,6 @@
 Company field is required,Bidang syarikat diperlukan,
 Creating Dimensions...,Membuat Dimensi ...,
 Duplicate entry against the item code {0} and manufacturer {1},Kemasukan salinan terhadap kod item {0} dan pengilang {1},
-Import Chart Of Accounts from CSV / Excel files,Import Carta Akaun dari fail CSV / Excel,
 Invalid GSTIN! The input you've entered doesn't match the GSTIN format for UIN Holders or Non-Resident OIDAR Service Providers,GSTIN tidak sah! Input yang anda masukkan tidak sepadan dengan format GSTIN untuk Penyedia Perkhidmatan OIDAR Pemegang UIN atau Bukan Pemastautin,
 Invoice Grand Total,Jumlah Besar Invois,
 Last carbon check date cannot be a future date,Tarikh pemeriksaan karbon terakhir tidak boleh menjadi tarikh yang akan datang,
@@ -3921,7 +3915,6 @@
 Plaid public token error,Ralat token umum awam,
 Plaid transactions sync error,Kesilapan transaksi sync kotak-kotak,
 Please check the error log for details about the import errors,Sila periksa log ralat untuk butiran tentang ralat import,
-Please click on the following link to set your new password,Sila klik pada pautan berikut untuk menetapkan kata laluan baru anda,
 Please create <b>DATEV Settings</b> for Company <b>{}</b>.,Sila buat <b>Pengaturan DATEV</b> untuk Syarikat <b>{}</b> .,
 Please create adjustment Journal Entry for amount {0} ,Sila buat penyesuaian Kemasukan Jurnal untuk jumlah {0},
 Please do not create more than 500 items at a time,Tolong jangan buat lebih daripada 500 item pada satu masa,
@@ -3997,6 +3990,7 @@
 Release date must be in the future,Tarikh pelepasan mestilah pada masa akan datang,
 Relieving Date must be greater than or equal to Date of Joining,Tarikh Pelunasan mestilah lebih besar daripada atau sama dengan Tarikh Bergabung,
 Rename,Nama semula,
+Rename Not Allowed,Namakan semula Tidak Dibenarkan,
 Repayment Method is mandatory for term loans,Kaedah pembayaran balik adalah wajib untuk pinjaman berjangka,
 Repayment Start Date is mandatory for term loans,Tarikh Mula Bayaran Balik adalah wajib untuk pinjaman berjangka,
 Report Item,Laporkan Perkara,
@@ -4043,7 +4037,6 @@
 Select All,Pilih Semua,
 Select Difference Account,Pilih Akaun Perbezaan,
 Select a Default Priority.,Pilih Keutamaan Lalai.,
-Select a Supplier from the Default Supplier List of the items below.,Pilih Pembekal dari Pembekal Lalai Senarai item di bawah.,
 Select a company,Pilih sebuah syarikat,
 Select finance book for the item {0} at row {1},Pilih buku pembiayaan untuk item {0} di baris {1},
 Select only one Priority as Default.,Pilih Hanya satu Keutamaan sebagai Lalai.,
@@ -4247,7 +4240,6 @@
 Actual ,Sebenar,
 Add to cart,Dalam Troli,
 Budget,Bajet,
-Chart Of Accounts Importer,Carta Pengimport Akaun,
 Chart of Accounts,Carta Akaun,
 Customer database.,Pangkalan data pelanggan.,
 Days Since Last order,Sejak hari Perintah lepas,
@@ -4546,7 +4538,6 @@
 Check Supplier Invoice Number Uniqueness,Semak Pembekal Invois Nombor Keunikan,
 Make Payment via Journal Entry,Buat Pembayaran melalui Journal Kemasukan,
 Unlink Payment on Cancellation of Invoice,Nyahpaut Pembayaran Pembatalan Invois,
-Unlink Advance Payment on Cancelation of Order,Unlink Payment Advance pada Pembatalan Pesanan,
 Book Asset Depreciation Entry Automatically,Buku Asset Kemasukan Susutnilai secara automatik,
 Automatically Add Taxes and Charges from Item Tax Template,Secara automatik menambah Cukai dan Caj dari Templat Cukai Item,
 Automatically Fetch Payment Terms,Termakan Pembayaran Secara Secara Automatik,
@@ -4940,7 +4931,6 @@
 POS Customer Group,POS Kumpulan Pelanggan,
 POS Field,POS Field,
 POS Item Group,POS Item Kumpulan,
-[Select],[Pilih],
 Company Address,Alamat syarikat,
 Update Stock,Update Saham,
 Ignore Pricing Rule,Abaikan Peraturan Harga,
@@ -6481,7 +6471,6 @@
 Appraisal Template,Templat Penilaian,
 For Employee Name,Nama Pekerja,
 Goals,Matlamat,
-Calculate Total Score,Kira Jumlah Skor,
 Total Score (Out of 5),Jumlah Skor (Daripada 5),
 "Any other remarks, noteworthy effort that should go in the records.","Sebarang kenyataan lain, usaha perlu diberi perhatian yang sepatutnya pergi dalam rekod.",
 Appraisal Goal,Penilaian Matlamat,
@@ -6599,11 +6588,6 @@
 Reason for Leaving,Sebab Berhenti,
 Leave Encashed?,Cuti ditunaikan?,
 Encashment Date,Penunaian Tarikh,
-Exit Interview Details,Butiran Keluar Temuduga,
-Held On,Diadakan Pada,
-Reason for Resignation,Sebab Peletakan jawatan,
-Better Prospects,Prospek yang lebih baik,
-Health Concerns,Kebimbangan Kesihatan,
 New Workplace,New Tempat Kerja,
 HR-EAD-.YYYY.-,HR-EAD-.YYYY.-,
 Returned Amount,Jumlah yang dikembalikan,
@@ -8239,9 +8223,6 @@
 Manufacturers used in Items,Pengeluar yang digunakan dalam Perkara,
 Limited to 12 characters,Terhad kepada 12 aksara,
 MAT-MR-.YYYY.-,MAT-MR-.YYYY.-,
-Set Warehouse,Tetapkan Gudang,
-Sets 'For Warehouse' in each row of the Items table.,Tetapkan &#39;Untuk Gudang&#39; di setiap baris jadual Item.,
-Requested For,Diminta Untuk,
 Partially Ordered,Diperintahkan Sebahagian,
 Transferred,dipindahkan,
 % Ordered,% Mengarahkan,
@@ -8690,8 +8671,6 @@
 Select warehouse for material requests,Pilih gudang untuk permintaan bahan,
 Transfer Materials For Warehouse {0},Pindahkan Bahan Untuk Gudang {0},
 Production Plan Material Request Warehouse,Gudang Permintaan Bahan Rancangan Pengeluaran,
-Set From Warehouse,Set Dari Gudang,
-Source Warehouse (Material Transfer),Gudang Sumber (Pemindahan Bahan),
 Sets 'Source Warehouse' in each row of the items table.,Tetapkan &#39;Source Warehouse&#39; di setiap baris jadual item.,
 Sets 'Target Warehouse' in each row of the items table.,Tetapkan &#39;Target Warehouse&#39; di setiap baris jadual item.,
 Show Cancelled Entries,Tunjukkan Entri yang Dibatalkan,
@@ -9157,7 +9136,6 @@
 Is Income Tax Component,Adakah Komponen Cukai Pendapatan,
 Component properties and references ,Sifat dan rujukan komponen,
 Additional Salary ,Gaji Tambahan,
-Condtion and formula,Ketetapan dan formula,
 Unmarked days,Hari tanpa tanda,
 Absent Days,Hari yang tidak hadir,
 Conditions and Formula variable and example,Keadaan dan pemboleh ubah Formula dan contoh,
@@ -9444,7 +9422,6 @@
 Please check your Plaid client ID and secret values,Sila periksa ID pelanggan Plaid dan nilai rahsia anda,
 Bank transaction creation error,Kesalahan penciptaan transaksi bank,
 Unit of Measurement,Unit Pengukuran,
-Row #{}: Selling rate for item {} is lower than its {}. Selling rate should be atleast {},Baris # {}: Kadar penjualan item {} lebih rendah daripada {}. Harga jualan mestilah sekurang-kurangnya {},
 Fiscal Year {0} Does Not Exist,Tahun Fiskal {0} Tidak Ada,
 Row # {0}: Returned Item {1} does not exist in {2} {3},Baris # {0}: Item yang Dikembalikan {1} tidak ada di {2} {3},
 Valuation type charges can not be marked as Inclusive,Caj jenis penilaian tidak boleh ditandakan sebagai Inklusif,
@@ -9598,8 +9575,60 @@
 Response Time for {0} priority in row {1} can't be greater than Resolution Time.,Masa Respons untuk {0} keutamaan dalam baris {1} tidak boleh lebih besar daripada Waktu Penyelesaian.,
 {0} is not enabled in {1},{0} tidak diaktifkan di {1},
 Group by Material Request,Kumpulkan mengikut Permintaan Bahan,
-"Row {0}: For Supplier {0}, Email Address is Required to Send Email","Baris {0}: Untuk Pembekal {0}, Alamat E-mel Diperlukan untuk Menghantar E-mel",
 Email Sent to Supplier {0},E-mel Dihantar ke Pembekal {0},
 "The Access to Request for Quotation From Portal is Disabled. To Allow Access, Enable it in Portal Settings.","Akses untuk Meminta Sebutharga Dari Portal Dinyahdayakan. Untuk Membolehkan Akses, Aktifkannya dalam Tetapan Portal.",
 Supplier Quotation {0} Created,Sebut Harga Pembekal {0} Dibuat,
 Valid till Date cannot be before Transaction Date,Sah sehingga Tarikh tidak boleh sebelum Tarikh Transaksi,
+Unlink Advance Payment on Cancellation of Order,Nyahpaut Bayaran Pendahuluan pada Pembatalan Pesanan,
+"Simple Python Expression, Example: territory != 'All Territories'","Ungkapan Python Ringkas, Contoh: wilayah! = &#39;Semua Wilayah&#39;",
+Sales Contributions and Incentives,Sumbangan dan Insentif Jualan,
+Sourced by Supplier,Diperolehi oleh Pembekal,
+Total weightage assigned should be 100%.<br>It is {0},Jumlah berat yang diberikan mestilah 100%.<br> Ia adalah {0},
+Account {0} exists in parent company {1}.,Akaun {0} wujud di syarikat induk {1}.,
+"To overrule this, enable '{0}' in company {1}","Untuk mengatasi perkara ini, aktifkan &#39;{0}&#39; di syarikat {1}",
+Invalid condition expression,Ungkapan keadaan tidak sah,
+Please Select a Company First,Sila Pilih Syarikat Pertama,
+Please Select Both Company and Party Type First,Sila Pilih Kedua-dua Jenis Syarikat dan Pesta Pertama,
+Provide the invoice portion in percent,Berikan bahagian invois dalam bentuk peratus,
+Give number of days according to prior selection,Berikan bilangan hari mengikut pilihan sebelumnya,
+Email Details,Maklumat E-mel,
+"Select a greeting for the receiver. E.g. Mr., Ms., etc.","Pilih ucapan untuk penerima. Cth Mr., Ms., dll.",
+Preview Email,Pratonton E-mel,
+Please select a Supplier,Sila pilih Pembekal,
+Supplier Lead Time (days),Masa Lead Pembekal (hari),
+"Home, Work, etc.","Rumah, Kerja, dll.",
+Exit Interview Held On,Temu Duga Keluar Diadakan,
+Condition and formula,Keadaan dan formula,
+Sets 'Target Warehouse' in each row of the Items table.,Tetapkan &#39;Target Warehouse&#39; di setiap baris jadual Item.,
+Sets 'Source Warehouse' in each row of the Items table.,Tetapkan &#39;Source Warehouse&#39; di setiap baris jadual Item.,
+POS Register,Daftar POS,
+"Can not filter based on POS Profile, if grouped by POS Profile","Tidak dapat menapis berdasarkan Profil POS, jika dikelompokkan berdasarkan Profil POS",
+"Can not filter based on Customer, if grouped by Customer","Tidak dapat menapis berdasarkan Pelanggan, jika dikelompokkan oleh Pelanggan",
+"Can not filter based on Cashier, if grouped by Cashier","Tidak dapat menapis berdasarkan Juruwang, jika dikelompokkan mengikut Juruwang",
+Payment Method,Kaedah Pembayaran,
+"Can not filter based on Payment Method, if grouped by Payment Method","Tidak dapat menapis berdasarkan Kaedah Pembayaran, jika dikelompokkan berdasarkan Kaedah Pembayaran",
+Supplier Quotation Comparison,Perbandingan Sebut Harga Pembekal,
+Price per Unit (Stock UOM),Harga seunit (Stok UOM),
+Group by Supplier,Kumpulan mengikut Pembekal,
+Group by Item,Kumpulan mengikut Item,
+Remember to set {field_label}. It is required by {regulation}.,Ingatlah untuk menetapkan {field_label}. Ia diharuskan oleh {peraturan}.,
+Enrollment Date cannot be before the Start Date of the Academic Year {0},Tarikh Pendaftaran tidak boleh sebelum Tarikh Mula Tahun Akademik {0},
+Enrollment Date cannot be after the End Date of the Academic Term {0},Tarikh Pendaftaran tidak boleh selepas Tarikh Akhir Tempoh Akademik {0},
+Enrollment Date cannot be before the Start Date of the Academic Term {0},Tarikh Pendaftaran tidak boleh sebelum Tarikh Mula Istilah Akademik {0},
+Posting future transactions are not allowed due to Immutable Ledger,Mengeposkan urus niaga masa depan tidak dibenarkan kerana Lejar Tidak Berubah,
+Future Posting Not Allowed,Pengeposan Masa Depan Tidak Dibolehkan,
+"To enable Capital Work in Progress Accounting, ","Untuk membolehkan Kerja Modal dalam Perakaunan Progress,",
+you must select Capital Work in Progress Account in accounts table,anda mesti memilih Capital Work in Progress Account dalam jadual akaun,
+You can also set default CWIP account in Company {},Anda juga boleh menetapkan akaun CWIP lalai di Syarikat {},
+The Request for Quotation can be accessed by clicking on the following button,Permintaan Sebutharga dapat diakses dengan mengklik butang berikut,
+Regards,Salam,
+Please click on the following button to set your new password,Klik pada butang berikut untuk menetapkan kata laluan baru anda,
+Update Password,Kemas kini Kata Laluan,
+Row #{}: Selling rate for item {} is lower than its {}. Selling {} should be atleast {},Baris # {}: Kadar penjualan item {} lebih rendah daripada {}. Menjual {} harus sekurang-kurangnya {},
+You can alternatively disable selling price validation in {} to bypass this validation.,Anda juga boleh mematikan pengesahan harga jualan di {} untuk memintas pengesahan ini.,
+Invalid Selling Price,Harga Jual Tidak Sah,
+Address needs to be linked to a Company. Please add a row for Company in the Links table.,Alamat perlu dihubungkan ke Syarikat. Sila tambah baris untuk Syarikat dalam jadual Pautan.,
+Company Not Linked,Syarikat Tidak Berkaitan,
+Import Chart of Accounts from CSV / Excel files,Import Carta Akaun dari fail CSV / Excel,
+Completed Qty cannot be greater than 'Qty to Manufacture',Kuantiti yang diselesaikan tidak boleh lebih besar daripada &#39;Kuantiti untuk Pembuatan&#39;,
+"Row {0}: For Supplier {1}, Email Address is Required to send an email","Baris {0}: Untuk Pembekal {1}, Alamat E-mel Diperlukan untuk menghantar e-mel",
diff --git a/erpnext/translations/my.csv b/erpnext/translations/my.csv
index 33f94b2..66fc343 100644
--- a/erpnext/translations/my.csv
+++ b/erpnext/translations/my.csv
@@ -521,7 +521,6 @@
 Chargeble,Chargeble,
 Charges are updated in Purchase Receipt against each item,စွဲချက်အသီးအသီးကို item ဆန့်ကျင်ဝယ်ယူခြင်းပြေစာ Update လုပ်ပေး,
 "Charges will be distributed proportionately based on item qty or amount, as per your selection",စွဲချက်သင့်ရဲ့ရွေးချယ်မှုနှုန်းအဖြစ်ကို item qty သို့မဟုတ်ပမာဏအပေါ်အခြေခံပြီးအခြိုးအစားဖြန့်ဝေပါလိမ့်မည်,
-Chart Of Accounts,ငွေစာရင်း၏ဇယား,
 Chart of Cost Centers,ကုန်ကျစရိတ်စင်တာများ၏ဇယား,
 Check all,အားလုံး Check,
 Checkout,ထွက်ခွာသည်,
@@ -581,7 +580,6 @@
 Compensatory Off,ပိတ် Compensatory,
 Compensatory leave request days not in valid holidays,ခိုင်လုံသောအားလပ်ရက်များတွင်အစားထိုးခွင့်တောင်းဆိုမှုကိုရက်ပေါင်းမဟုတ်,
 Complaint,တိုင်ကြားစာ,
-Completed Qty can not be greater than 'Qty to Manufacture',ပြီးစီး Qty &#39;&#39; Qty ထုတ်လုပ်ခြင်းမှ &#39;&#39; ထက် သာ. ကြီးမြတ်မဖွစျနိုငျ,
 Completion Date,ပြီးစီးနေ့စွဲ,
 Computer,ကွန်ပျူတာ,
 Condition,condition,
@@ -2033,7 +2031,6 @@
 Please select Charge Type first,တာဝန်ခံကအမျိုးအစားပထမဦးဆုံးကိုရွေးပါ ကျေးဇူးပြု.,
 Please select Company,ကုမ္ပဏီကို select ကျေးဇူးပြု.,
 Please select Company and Designation,ကုမ္ပဏီနှင့်ဒီဇိုင်းကိုရွေးချယ်ပါ ကျေးဇူးပြု.,
-Please select Company and Party Type first,ပထမဦးဆုံးကုမ္ပဏီနှင့်ပါတီ Type ကိုရွေးပါ ကျေးဇူးပြု.,
 Please select Company and Posting Date to getting entries,posts များလာပြီမှကုမ္ပဏီနှင့် Post date ကို select ပေးပါ,
 Please select Company first,ကုမ္ပဏီပထမဦးဆုံးကိုရွေးပါ ကျေးဇူးပြု.,
 Please select Completion Date for Completed Asset Maintenance Log,Completed ပိုင်ဆိုင်မှုကို Maintenance Log in ဝင်ရန်အဘို့အပြီးစီးနေ့စွဲကို select ပေးပါ,
@@ -2980,7 +2977,6 @@
 The name of your company for which you are setting up this system.,သင်သည်ဤစနစ်ကတည်ထောင်ထားသည့်အဘို့အသင့်ကုမ္ပဏီ၏နာမတော်။,
 The number of shares and the share numbers are inconsistent,ရှယ်ယာအရေအတွက်နှင့်ရှယ်ယာဂဏန်းကိုက်ညီမှုရှိပါတယ်,
 The payment gateway account in plan {0} is different from the payment gateway account in this payment request,အစီအစဉ် {0} အတွက်ငွေပေးချေမှုတံခါးပေါက်အကောင့်ဤငွေပေးချေမှုတောင်းဆိုမှုကိုအတွက်ငွေပေးချေမှုတံခါးပေါက်အကောင့်မှကွဲပြားခြားနားသည်,
-The request for quotation can be accessed by clicking on the following link,quotation အဘို့မေတ္တာရပ်ခံချက်ကိုအောက်ပါ link ကိုနှိပ်ခြင်းအားဖြင့်ဝင်ရောက်စေနိုင်သည်,
 The selected BOMs are not for the same item,ရွေးချယ်ထားတဲ့ BOMs တူညီတဲ့အရာအတွက်မဟုတ်,
 The selected item cannot have Batch,ရွေးချယ်ထားတဲ့ item Batch ရှိသည်မဟုတ်နိုင်,
 The seller and the buyer cannot be the same,ရောင်းသူနှင့်ဝယ်တူမဖွစျနိုငျ,
@@ -3130,7 +3126,6 @@
 Total flexible benefit component amount {0} should not be less than max benefits {1},စုစုပေါင်းပြောင်းလွယ်ပြင်လွယ်အကျိုးအတွက်အစိတ်အပိုင်းငွေပမာဏ {0} max ကိုအကျိုးခံစားခွင့် {1} ထက်လျော့နည်းမဖြစ်သင့်,
 Total hours: {0},စုစုပေါင်းနာရီ: {0},
 Total leaves allocated is mandatory for Leave Type {0},ခွဲဝေစုစုပေါင်းအရွက်ခွင့်အမျိုးအစား {0} တွေအတွက်မဖြစ်မနေဖြစ်ပါသည်,
-Total weightage assigned should be 100%. It is {0},တာဝန်ပေးစုစုပေါင်း weightage 100% ဖြစ်သင့်သည်။ ဒါဟာ {0} သည်,
 Total working hours should not be greater than max working hours {0},စုစုပေါင်းအလုပ်ချိန်နာရီ {0} အလုပ်လုပ် max ကိုထက် သာ. ကြီးမြတ်မဖြစ်သင့်ပါဘူး,
 Total {0} ({1}),စုစုပေါင်း {0} ({1}),
 "Total {0} for all items is zero, may be you should change 'Distribute Charges Based On'","စုစုပေါင်း {0} ပစ္စည်းများအားလုံးအဘို့, သုညဖြစ်ပါသည်သင်က &#39;&#39; ဖြန့်ဝေတွင် အခြေခံ. စွပ်စွဲချက် &#39;&#39; ကိုပြောင်းလဲသင့်ပါတယ်ဖြစ်နိုင်သည်",
@@ -3544,7 +3539,6 @@
 Company field is required,ကုမ္ပဏီလယ်ကွက်လိုအပ်ပါသည်,
 Creating Dimensions...,Creating အရွယ်အစား ...,
 Duplicate entry against the item code {0} and manufacturer {1},ပစ္စည်းကုဒ် {0} နှင့်ထုတ်လုပ်သူ {1} ဆန့်ကျင် entry ကို Duplicate,
-Import Chart Of Accounts from CSV / Excel files,CSV ဖိုင် / Excel ကိုဖိုင်တွေထဲက Accounts ကို၏သွင်းကုန်ဇယား,
 Invalid GSTIN! The input you've entered doesn't match the GSTIN format for UIN Holders or Non-Resident OIDAR Service Providers,မှားနေသော GSTIN! သင်ထည့်သွင်းဖူးတဲ့ input ကို UIN ရှင်သို့မဟုတ် Non-ဌာနေ OIDAR Service Providers များအတွက် GSTIN format နဲ့မကိုက်ညီ,
 Invoice Grand Total,ငွေတောင်းခံလွှာက Grand စုစုပေါင်း,
 Last carbon check date cannot be a future date,နောက်ဆုံးကာဗွန်စစ်ဆေးမှုများနေ့စွဲအနာဂတ်နေ့စွဲမဖွစျနိုငျ,
@@ -3921,7 +3915,6 @@
 Plaid public token error,အများပြည်သူတိုကင်နံပါတ်အမှား Plaid,
 Plaid transactions sync error,Plaid အရောင်းအချိန်ကိုက်မှုအမှား,
 Please check the error log for details about the import errors,သွင်းကုန်အမှားအယွင်းများအကြောင်းအသေးစိတ်များအတွက်အမှားမှတ်တမ်းစစ်ဆေးပါ,
-Please click on the following link to set your new password,သင့်ရဲ့စကားဝှက်အသစ်တင်ထားရန်အောက်ပါ link ကို click နှိပ်ပြီး ကျေးဇူးပြု.,
 Please create <b>DATEV Settings</b> for Company <b>{}</b>.,ကျေးဇူးပြု၍ ကုမ္ပဏီအတွက် <b>DATEV ဆက်တင်များ</b> <b>{} ကို</b> ဖန်တီးပါ။,
 Please create adjustment Journal Entry for amount {0} ,ကျေးဇူးပြု၍ ညှိနှိုင်းမှုကို Journal Entry အတွက်ငွေပမာဏ {0} ဖန်တီးပါ။,
 Please do not create more than 500 items at a time,တစ်ကြိမ် 500 ကျော်ပစ္စည်းများကိုဖန်တီးပါဘူးကျေးဇူးပြုပြီး,
@@ -3997,6 +3990,7 @@
 Release date must be in the future,ဖြန့်ချိသည့်ရက်စွဲအနာဂတ်၌ဖြစ်ရပါမည်,
 Relieving Date must be greater than or equal to Date of Joining,ကယ်ဆယ်ရေးနေ့သည် ၀ င်ရောက်သည့်နေ့ထက်ကြီးသည်သို့မဟုတ်တူညီရမည်,
 Rename,Rename,
+Rename Not Allowed,အမည်ပြောင်းခွင့်မပြု,
 Repayment Method is mandatory for term loans,ချေးငွေသက်တမ်းကိုပြန်ဆပ်ရန်နည်းလမ်းသည်မဖြစ်မနေလိုအပ်သည်,
 Repayment Start Date is mandatory for term loans,ငွေပြန်အမ်းခြင်းရက်သည်ချေးငွေများအတွက်မဖြစ်မနေလိုအပ်သည်,
 Report Item,အစီရင်ခံစာ Item,
@@ -4043,7 +4037,6 @@
 Select All,အားလုံးကို Select လုပ်ပါ,
 Select Difference Account,Difference အကောင့်ကိုရွေးချယ်ပါ,
 Select a Default Priority.,တစ်ပုံမှန်ဦးစားပေးရွေးချယ်ပါ။,
-Select a Supplier from the Default Supplier List of the items below.,အောက်ဖော်ပြပါပစ္စည်းများ၏ပုံမှန်ပေးသွင်းသူစာရင်းမှပေးသွင်းသူကိုရွေးပါ။,
 Select a company,ကုမ္ပဏီကိုရွေးချယ်ပါ,
 Select finance book for the item {0} at row {1},{1} အတန်းမှာကို item {0} များအတွက်ဘဏ္ဍာရေးစာအုပ်ကို Select လုပ်ပါ,
 Select only one Priority as Default.,ပုံမှန်အဖြစ်တစ်ဦးတည်းသာဦးစားပေးရွေးချယ်ပါ။,
@@ -4247,7 +4240,6 @@
 Actual ,အမှန်တကယ်,
 Add to cart,စျေးဝယ်ခြင်းထဲသို့ထည့်သည်,
 Budget,ဘတ်ဂျက်,
-Chart Of Accounts Importer,Accounts ကိုတင်သွင်းမှုဇယား,
 Chart of Accounts,အကောင့်ဇယား,
 Customer database.,ဖောက်သည်ဒေတာဘေ့စ။,
 Days Since Last order,နောက်ဆုံးအမိန့်အပြီးရက်များ,
@@ -4546,7 +4538,6 @@
 Check Supplier Invoice Number Uniqueness,ပေးသွင်းပြေစာနံပါတ်ထူးခြားသောစစ်ဆေး,
 Make Payment via Journal Entry,ဂျာနယ် Entry မှတဆင့်ငွေပေးချေမှုရမည့် Make,
 Unlink Payment on Cancellation of Invoice,ငွေတောင်းခံလွှာ၏ Cancellation အပေါ်ငွေပေးချေမှုရမည့်လင့်ဖြုတ်ရန်,
-Unlink Advance Payment on Cancelation of Order,အမိန့်များ Cancel အပေါ်ကြိုတင်ငွေပေးချေလင့်ဖြုတ်ရန်,
 Book Asset Depreciation Entry Automatically,အလိုအလျောက်စာအုပ်ပိုင်ဆိုင်မှုတန်ဖိုး Entry &#39;,
 Automatically Add Taxes and Charges from Item Tax Template,အလိုအလျှောက် Item အခွန် Template ထဲကနေအခွန်နှင့်စွပ်စွဲချက် Add,
 Automatically Fetch Payment Terms,ငွေပေးချေမှုရမည့်စည်းမျဉ်းစည်းကမ်းများအလိုအလြောကျခေါ်ယူ,
@@ -4940,7 +4931,6 @@
 POS Customer Group,POS ဖောက်သည်အုပ်စု,
 POS Field,POS Field,
 POS Item Group,POS ပစ္စည်းအုပ်စု,
-[Select],[ရွေးပါ],
 Company Address,ကုမ္ပဏီလိပ်စာ,
 Update Stock,စတော့အိတ် Update,
 Ignore Pricing Rule,စျေးနှုန်းများ Rule Ignore,
@@ -6481,7 +6471,6 @@
 Appraisal Template,စိစစ်ရေး Template:,
 For Employee Name,န်ထမ်းနာမတော်အဘို့,
 Goals,ရည်မှန်းချက်များ,
-Calculate Total Score,စုစုပေါင်းရမှတ်ကိုတွက်ချက်,
 Total Score (Out of 5),(5 ထဲက) စုစုပေါင်းရမှတ်,
 "Any other remarks, noteworthy effort that should go in the records.","အခြားမည်သည့်သဘောထားမှတ်ချက်, မှတ်တမ်းများအတွက်သွားသင့်ကြောင်းမှတ်သားဖွယ်အားထုတ်မှု။",
 Appraisal Goal,စိစစ်ရေးဂိုး,
@@ -6599,11 +6588,6 @@
 Reason for Leaving,ထွက်ခွာရသည့်အကြောင်းရင်း,
 Leave Encashed?,Encashed Leave?,
 Encashment Date,Encashment နေ့စွဲ,
-Exit Interview Details,Exit ကိုအင်တာဗျူးအသေးစိတ်ကို,
-Held On,တွင်ကျင်းပ,
-Reason for Resignation,ရာထူးမှနုတ်ထွက်ရသည့်အကြောင်းရင်း,
-Better Prospects,သာ. ကောင်း၏အလားအလာ,
-Health Concerns,ကနျြးမာရေးကိုဒေသခံများကစိုးရိမ်ပူပန်နေကြ,
 New Workplace,နယူးလုပ်ငန်းခွင်,
 HR-EAD-.YYYY.-,HR-EAD-.YYYY.-,
 Returned Amount,ပြန်လာသောငွေပမာဏ,
@@ -8239,9 +8223,6 @@
 Manufacturers used in Items,ပစ္စည်းများအတွက်အသုံးပြုထုတ်လုပ်သူများ,
 Limited to 12 characters,12 ဇာတ်ကောင်များကန့်သတ်,
 MAT-MR-.YYYY.-,MAT-MR-.YYYY.-,
-Set Warehouse,ဂိုဒေါင်ကိုသတ်မှတ်မည်,
-Sets 'For Warehouse' in each row of the Items table.,ပစ္စည်းများဇယား၏အတန်းတစ်ခုစီတွင် &#39;For Warehouse&#39; ကိုသတ်မှတ်သည်။,
-Requested For,အကြောင်းမူကားမေတ္တာရပ်ခံ,
 Partially Ordered,တစ်စိတ်တစ်ပိုင်းအမိန့်,
 Transferred,လွှဲပြောင်း,
 % Ordered,% မိန့်ထုတ်,
@@ -8690,8 +8671,6 @@
 Select warehouse for material requests,ပစ္စည်းတောင်းဆိုမှုများအတွက်ဂိုဒေါင်ကိုရွေးပါ,
 Transfer Materials For Warehouse {0},ဂိုဒေါင်အတွက်လွှဲပြောင်းပစ္စည်းများ {0},
 Production Plan Material Request Warehouse,ထုတ်လုပ်မှုအစီအစဉ်ပစ္စည်းတောင်းခံဂိုဒေါင်,
-Set From Warehouse,ဂိုဒေါင်မှသတ်မှတ်မည်,
-Source Warehouse (Material Transfer),ရင်းမြစ်ဂိုဒေါင် (ပစ္စည်းလွှဲပြောင်းခြင်း),
 Sets 'Source Warehouse' in each row of the items table.,ပစ္စည်းများဇယား၏အတန်းတစ်ခုစီတွင် &#39;Source Warehouse&#39; ကိုသတ်မှတ်ပါ။,
 Sets 'Target Warehouse' in each row of the items table.,ပစ္စည်းများဇယား၏တန်းတစ်ခုစီတွင် &#39;Target Warehouse&#39; ကိုသတ်မှတ်ပါ။,
 Show Cancelled Entries,Cancel Entries ကိုပြပါ,
@@ -9157,7 +9136,6 @@
 Is Income Tax Component,ဝင်ငွေခွန်အစိတ်အပိုင်းဖြစ်သည်,
 Component properties and references ,အစိတ်အပိုင်းဂုဏ်သတ္တိများနှင့်ကိုးကား,
 Additional Salary ,အပိုလစာ,
-Condtion and formula,အခြေအနေနှင့်ပုံသေနည်း,
 Unmarked days,အမှတ်အသားပြုထားသည့်နေ့ရက်များ,
 Absent Days,ပျက်ကွက်ရက်များ,
 Conditions and Formula variable and example,အခြေအနေများနှင့်ဖော်မြူလာ variable ကိုနှင့်ဥပမာ,
@@ -9444,7 +9422,6 @@
 Please check your Plaid client ID and secret values,ကျေးဇူးပြု၍ သင်၏ Plaid client ID နှင့်လျှို့ဝှက်တန်ဖိုးများကိုစစ်ဆေးပါ,
 Bank transaction creation error,ဘဏ်ငွေပေးငွေယူဖန်တီးမှုအမှား,
 Unit of Measurement,အတိုင်းအတာယူနစ်,
-Row #{}: Selling rate for item {} is lower than its {}. Selling rate should be atleast {},Row # {}: item {} အတွက်ရောင်းနှုန်းသည်၎င်း {} ထက်နိမ့်သည်။ ရောင်းနှုန်းမှာ atleast ဖြစ်သင့်သည်။,
 Fiscal Year {0} Does Not Exist,ဘဏ္calာရေးနှစ် {0} မတည်ရှိပါ,
 Row # {0}: Returned Item {1} does not exist in {2} {3},Row # {0}: {2} {3} မှာမပြန်ပါဘူး။,
 Valuation type charges can not be marked as Inclusive,တန်ဖိုးအမျိုးအစားကိုပါဝင်မှုအဖြစ်မှတ်သားလို့မရပါ,
@@ -9598,8 +9575,60 @@
 Response Time for {0} priority in row {1} can't be greater than Resolution Time.,{1} အတန်း {1} တွင်တုန့်ပြန်သောအချိန်သည် Resolution Time ထက်မကြီးပါ။,
 {0} is not enabled in {1},{0} ကို {1} တွင်မဖွင့်ပါ,
 Group by Material Request,ပစ္စည်းတောင်းဆိုမှုအားဖြင့်အုပ်စု,
-"Row {0}: For Supplier {0}, Email Address is Required to Send Email",အတန်း {0} - ပေးသွင်းသူအတွက် {0}၊ အီးမေးလ်လိပ်စာပေးရန်အီးမေးလ်လိပ်စာလိုအပ်သည်,
 Email Sent to Supplier {0},ပေးသွင်းသူထံသို့အီးမေးလ်ပေးပို့သည် {0},
 "The Access to Request for Quotation From Portal is Disabled. To Allow Access, Enable it in Portal Settings.",Portal မှဈေးနှုန်းတောင်းခံရန် Access ကိုပိတ်ထားသည်။ Access ကိုခွင့်ပြုရန် Portal Settings တွင်၎င်းကို Enable လုပ်ပါ။,
 Supplier Quotation {0} Created,ပေးသွင်းစျေးနှုန်း {0} Created,
 Valid till Date cannot be before Transaction Date,နေ့စွဲမတိုင်မီသက်တမ်းကုန်ဆုံးရက်စွဲမတိုင်မီမဖြစ်နိုင်ပါ,
+Unlink Advance Payment on Cancellation of Order,အမိန့်ဖျက်သိမ်းမှုအပေါ်ကြိုတင်ငွေပေးချေမှု Unlink,
+"Simple Python Expression, Example: territory != 'All Territories'",ရိုးရှင်းသော Python အသုံးအနှုန်း၊ ဥပမာ: territory! = &#39;နယ်မြေအားလုံး&#39;,
+Sales Contributions and Incentives,အရောင်းပံ့ပိုးမှုများနှင့်မက်လုံးပေး,
+Sourced by Supplier,ပေးသွင်းသူကရရှိသည်,
+Total weightage assigned should be 100%.<br>It is {0},တာဝန်ပေးအပ်စုစုပေါင်း weightage 100% ဖြစ်သင့်သည်။<br> {0} ဖြစ်တယ်,
+Account {0} exists in parent company {1}.,အကောင့် {0} သည်မိခင်ကုမ္ပဏီတွင်တည်ရှိသည် {1} ။,
+"To overrule this, enable '{0}' in company {1}",၎င်းကိုပယ်ဖျက်နိုင်ရန်ကုမ္ပဏီ {{}} တွင် &#39;{0}&#39; ကိုဖွင့်ပါ။,
+Invalid condition expression,မမှန်ကန်သောအခြေအနေစကားရပ်,
+Please Select a Company First,ကျေးဇူးပြု၍ ကုမ္ပဏီတစ်ခုရွေးပါ,
+Please Select Both Company and Party Type First,ကျေးဇူးပြု၍ ကုမ္ပဏီနှင့်ပါတီအမျိုးအစားကို ဦး စွာရွေးပါ,
+Provide the invoice portion in percent,ငွေတောင်းခံလွှာကိုရာခိုင်နှုန်းဖြင့်ပေးပါ,
+Give number of days according to prior selection,ကြိုတင်ရွေးချယ်မှုအရရက်အရေအတွက်ကိုပေးပါ,
+Email Details,အီးမေးလ်အသေးစိတ်,
+"Select a greeting for the receiver. E.g. Mr., Ms., etc.",လက်ခံများအတွက်နှုတ်ခွန်းဆက်ကိုရွေးချယ်ပါ။ ဥပမာ၊ Mr.,
+Preview Email,အီးမေးလ်ကိုအစမ်းကြည့်ပါ,
+Please select a Supplier,ပေးသွင်းသူရွေးပါ,
+Supplier Lead Time (days),ပေးသွင်းသူအချိန် (ရက်များ),
+"Home, Work, etc.",အိမ်၊ အလုပ်စသည်,
+Exit Interview Held On,Exit Interview တွင်ကျင်းပသည်,
+Condition and formula,အခြေအနေနှင့်ပုံသေနည်း,
+Sets 'Target Warehouse' in each row of the Items table.,ပစ္စည်းများဇယား၏တန်းတစ်ခုစီတွင် &#39;Target Warehouse&#39; ကိုသတ်မှတ်ပါ။,
+Sets 'Source Warehouse' in each row of the Items table.,ပစ္စည်းများဇယား၏အတန်းတိုင်း၌ &#39;Source Warehouse&#39; ကိုသတ်မှတ်သည်။,
+POS Register,POS မှတ်ပုံတင်ပါ,
+"Can not filter based on POS Profile, if grouped by POS Profile",POS ပရိုဖိုင်းဖြင့်အုပ်စုဖွဲ့ပါက POS ပရိုဖိုင်းကို အခြေခံ၍ စီစစ်။ မရပါ,
+"Can not filter based on Customer, if grouped by Customer",ဝယ်သူမှအုပ်စုဖွဲ့လျှင်ဖောက်သည်ကို အခြေခံ၍ စီစစ်။ မရပါ,
+"Can not filter based on Cashier, if grouped by Cashier",ငွေကိုင်သည်အုပ်စုဖွဲ့ပါကငွေကိုင်အပေါ် အခြေခံ၍ စီစစ်။ မရပါ,
+Payment Method,ငွေပေးချေစနစ်,
+"Can not filter based on Payment Method, if grouped by Payment Method",ငွေပေးချေမှုနည်းလမ်းဖြင့်အုပ်စုဖွဲ့ပါကငွေပေးချေမှုနည်းလမ်းကို အခြေခံ၍ စီစစ်။ မရပါ,
+Supplier Quotation Comparison,ပေးသွင်းစျေးနှုန်းနှိုင်းယှဉ်,
+Price per Unit (Stock UOM),တစ်ယူနစ်စျေးနှုန်း (စတော့အိတ် UOM),
+Group by Supplier,ပေးသွင်းခြင်းဖြင့်အုပ်စု,
+Group by Item,ပစ္စည်းအားဖြင့်အုပ်စုတစ်စု,
+Remember to set {field_label}. It is required by {regulation}.,{field_label} ကိုသတ်မှတ်ရန်သတိရပါ။ {{စည်းမျဉ်း} ကလိုအပ်သည်။,
+Enrollment Date cannot be before the Start Date of the Academic Year {0},ကျောင်းအပ်နှံသည့်နေ့ရက်ကိုပညာသင်နှစ်စတင်ချိန်မတိုင်မီ {0} မဖြစ်နိုင်ပါ။,
+Enrollment Date cannot be after the End Date of the Academic Term {0},{0} ပညာသင်နှစ်ကုန်ဆုံးပြီးနောက်တွင်ကျောင်းအပ်ရန်နေ့ရက်မဖြစ်နိုင်ပါ။,
+Enrollment Date cannot be before the Start Date of the Academic Term {0},ကျောင်းအပ်နှံသည့်နေ့သည်ပညာသင်နှစ်သက်တမ်းမစမှီမဖြစ်နိုင်ပါ။ {0},
+Posting future transactions are not allowed due to Immutable Ledger,Immutable Ledger ကြောင့်အနာဂတ်အရောင်းအ ၀ ယ်များကိုခွင့်မပြုပါ,
+Future Posting Not Allowed,အနာဂတ်တင်ပို့ခြင်းကိုခွင့်မပြုပါ,
+"To enable Capital Work in Progress Accounting, ","တိုးတက်မှုစာရင်းအင်းအတွက်မြို့တော်အလုပ် enable လုပ်ဖို့,",
+you must select Capital Work in Progress Account in accounts table,သင်ဟာ Account Work တွင် Progress Account ရှိ Capital Work ကိုရွေးချယ်ရမည်,
+You can also set default CWIP account in Company {},Default CWIP အကောင့်ကိုကုမ္ပဏီ {} တွင်လည်းသတ်မှတ်နိုင်သည်။,
+The Request for Quotation can be accessed by clicking on the following button,ဈေးနှုန်းတောင်းခံမှုကိုအောက်ပါခလုတ်ကိုနှိပ်ခြင်းအားဖြင့် ၀ င်ရောက်ကြည့်ရှုနိုင်သည်,
+Regards,လေးစားပါတယ်,
+Please click on the following button to set your new password,သင်၏စကားဝှက်အသစ်ကိုသတ်မှတ်ရန်အောက်ပါခလုတ်ကိုနှိပ်ပါ,
+Update Password,စကားဝှက်ကိုမွမ်းမံပါ,
+Row #{}: Selling rate for item {} is lower than its {}. Selling {} should be atleast {},Row # {}: item {} အတွက်ရောင်းနှုန်းသည်၎င်း {} ထက်နိမ့်သည်။ {} ရောင်းသည် atleast ဖြစ်သင့်သည်။,
+You can alternatively disable selling price validation in {} to bypass this validation.,ဤအတည်ပြုခြင်းကိုကျော်လွှားရန် {} တွင်ရောင်းဈေးနှုန်း validation ကိုတနည်းအားဖြင့်ပိတ်နိုင်သည်။,
+Invalid Selling Price,မမှန်ကန်သောရောင်းဈေး,
+Address needs to be linked to a Company. Please add a row for Company in the Links table.,လိပ်စာသည်ကုမ္ပဏီနှင့်ချိတ်ဆက်ရန်လိုအပ်သည် ကျေးဇူးပြု၍ Links ဇယားတွင်ကုမ္ပဏီအတွက်အတန်းတစ်ခုထည့်ပေးပါ။,
+Company Not Linked,ကုမ္ပဏီဆက်စပ်မှုမရှိပါ,
+Import Chart of Accounts from CSV / Excel files,CSV / Excel ဖိုင်များမှငွေစာရင်းဇယားတင်သွင်းပါ,
+Completed Qty cannot be greater than 'Qty to Manufacture',ပြည့်စုံသောအရေအတွက်သည် &#39;Qty to Manufacturing&#39; &#39;ထက်မကြီးနိုင်ပါ။,
+"Row {0}: For Supplier {1}, Email Address is Required to send an email",အတန်း {0} - ပေးသွင်းသူအတွက် {1}၊ အီးမေးလ်လိပ်စာတစ်ခုပေးပို့ရန်အီးမေးလ်လိပ်စာလိုအပ်သည်,
diff --git a/erpnext/translations/nl.csv b/erpnext/translations/nl.csv
index cd885ce..d4a651d 100644
--- a/erpnext/translations/nl.csv
+++ b/erpnext/translations/nl.csv
@@ -521,7 +521,6 @@
 Chargeble,Chargeble,
 Charges are updated in Purchase Receipt against each item,Kosten worden bijgewerkt in Kwitantie tegen elk item,
 "Charges will be distributed proportionately based on item qty or amount, as per your selection","Kosten zullen worden proportioneel gedistribueerd op basis van punt aantal of de hoeveelheid, als per uw selectie",
-Chart Of Accounts,Rekeningschema,
 Chart of Cost Centers,Kostenplaatsenschema,
 Check all,Alles aanvinken,
 Checkout,Uitchecken,
@@ -581,7 +580,6 @@
 Compensatory Off,compenserende Off,
 Compensatory leave request days not in valid holidays,Verzoek om compenserende verlofaanvragen niet in geldige feestdagen,
 Complaint,Klacht,
-Completed Qty can not be greater than 'Qty to Manufacture',Voltooid aantal mag niet groter zijn dan 'Aantal te produceren',
 Completion Date,Voltooiingsdatum,
 Computer,Computer,
 Condition,Voorwaarde,
@@ -2033,7 +2031,6 @@
 Please select Charge Type first,Selecteer eerst een Charge Type,
 Please select Company,Selecteer Company,
 Please select Company and Designation,Selecteer Bedrijf en Aanwijzing,
-Please select Company and Party Type first,Selecteer Company en Party Type eerste,
 Please select Company and Posting Date to getting entries,Selecteer Bedrijf en boekingsdatum om inzendingen te ontvangen,
 Please select Company first,Selecteer Company eerste,
 Please select Completion Date for Completed Asset Maintenance Log,Selecteer de voltooiingsdatum voor het uitgevoerde onderhoudslogboek,
@@ -2980,7 +2977,6 @@
 The name of your company for which you are setting up this system.,De naam van uw bedrijf waar u het systeem voor op zet.,
 The number of shares and the share numbers are inconsistent,Het aantal aandelen en de aandelenaantallen zijn inconsistent,
 The payment gateway account in plan {0} is different from the payment gateway account in this payment request,Het betalingsgateway-account in plan {0} verschilt van het betalingsgateway-account in dit betalingsverzoek,
-The request for quotation can be accessed by clicking on the following link,Het verzoek voor een offerte kan worden geopend door te klikken op de volgende link,
 The selected BOMs are not for the same item,De geselecteerde stuklijsten zijn niet voor hetzelfde item,
 The selected item cannot have Batch,Het geselecteerde item kan niet Batch hebben,
 The seller and the buyer cannot be the same,De verkoper en de koper kunnen niet hetzelfde zijn,
@@ -3130,7 +3126,6 @@
 Total flexible benefit component amount {0} should not be less than max benefits {1},Het totale bedrag van de flexibele uitkeringscomponent {0} mag niet minder zijn dan de maximale uitkeringen {1},
 Total hours: {0},Totaal aantal uren: {0},
 Total leaves allocated is mandatory for Leave Type {0},Totaal aantal toegewezen verlof is verplicht voor verloftype {0},
-Total weightage assigned should be 100%. It is {0},Totaal toegewezen gewicht moet 100% zijn. Het is {0},
 Total working hours should not be greater than max working hours {0},Totaal aantal werkuren mag niet groter zijn dan max werktijden {0},
 Total {0} ({1}),Totaal {0} ({1}),
 "Total {0} for all items is zero, may be you should change 'Distribute Charges Based On'","Totaal {0} voor alle items nul is, kan je zou moeten veranderen &#39;Verdeel heffingen op basis van&#39;",
@@ -3544,7 +3539,6 @@
 Company field is required,Bedrijfsveld is verplicht,
 Creating Dimensions...,Dimensies maken ...,
 Duplicate entry against the item code {0} and manufacturer {1},Dubbele invoer tegen de artikelcode {0} en fabrikant {1},
-Import Chart Of Accounts from CSV / Excel files,Grafiek van accounts importeren vanuit CSV / Excel-bestanden,
 Invalid GSTIN! The input you've entered doesn't match the GSTIN format for UIN Holders or Non-Resident OIDAR Service Providers,"Ongeldige GSTIN! De invoer die u heeft ingevoerd, komt niet overeen met de GSTIN-indeling voor UIN-houders of niet-residente OIDAR-serviceproviders",
 Invoice Grand Total,Totaal factuurbedrag,
 Last carbon check date cannot be a future date,De laatste carbon check-datum kan geen toekomstige datum zijn,
@@ -3921,7 +3915,6 @@
 Plaid public token error,Plaid public token error,
 Plaid transactions sync error,Synchronisatiefout voor transacties met plaid,
 Please check the error log for details about the import errors,Controleer het foutenlogboek voor details over de importfouten,
-Please click on the following link to set your new password,Klik op de volgende link om je nieuwe wachtwoord in te stellen,
 Please create <b>DATEV Settings</b> for Company <b>{}</b>.,Maak <b>DATEV-instellingen</b> voor bedrijf <b>{}</b> .,
 Please create adjustment Journal Entry for amount {0} ,Maak een aanpassing Journaalboeking voor bedrag {0},
 Please do not create more than 500 items at a time,Maak niet meer dan 500 items tegelijk,
@@ -3997,6 +3990,7 @@
 Release date must be in the future,Releasedatum moet in de toekomst liggen,
 Relieving Date must be greater than or equal to Date of Joining,Ontlastingsdatum moet groter zijn dan of gelijk zijn aan de datum van toetreding,
 Rename,Hernoemen,
+Rename Not Allowed,Naam wijzigen niet toegestaan,
 Repayment Method is mandatory for term loans,Terugbetalingsmethode is verplicht voor termijnleningen,
 Repayment Start Date is mandatory for term loans,De startdatum van de terugbetaling is verplicht voor termijnleningen,
 Report Item,Meld item,
@@ -4043,7 +4037,6 @@
 Select All,Alles selecteren,
 Select Difference Account,Selecteer Verschilaccount,
 Select a Default Priority.,Selecteer een standaardprioriteit.,
-Select a Supplier from the Default Supplier List of the items below.,Selecteer een leverancier uit de standaardleverancierslijst van de onderstaande items.,
 Select a company,Selecteer een bedrijf,
 Select finance book for the item {0} at row {1},Selecteer financieringsboek voor het artikel {0} op rij {1},
 Select only one Priority as Default.,Selecteer slechts één prioriteit als standaard.,
@@ -4247,7 +4240,6 @@
 Actual ,Werkelijk,
 Add to cart,In winkelwagen,
 Budget,Begroting,
-Chart Of Accounts Importer,Grafiek van accounts importeur,
 Chart of Accounts,Rekeningschema,
 Customer database.,Klantendatabase.,
 Days Since Last order,Dagen sinds laatste Order,
@@ -4546,7 +4538,6 @@
 Check Supplier Invoice Number Uniqueness,Controleer Leverancier Factuurnummer Uniqueness,
 Make Payment via Journal Entry,Betalen via Journal Entry,
 Unlink Payment on Cancellation of Invoice,Ontkoppelen Betaling bij annulering van de factuur,
-Unlink Advance Payment on Cancelation of Order,Vooruitbetaling bij annulering van bestelling ontkoppelen,
 Book Asset Depreciation Entry Automatically,Automatische afschrijving van de activa van de boekwaarde,
 Automatically Add Taxes and Charges from Item Tax Template,Automatisch belastingen en heffingen toevoegen op basis van sjabloon voor artikelbelasting,
 Automatically Fetch Payment Terms,Automatisch betalingsvoorwaarden ophalen,
@@ -4940,7 +4931,6 @@
 POS Customer Group,POS Customer Group,
 POS Field,POS-veld,
 POS Item Group,POS Item Group,
-[Select],[Selecteer],
 Company Address,bedrijfsadres,
 Update Stock,Voorraad bijwerken,
 Ignore Pricing Rule,Negeer Prijsregel,
@@ -6481,7 +6471,6 @@
 Appraisal Template,Beoordeling Sjabloon,
 For Employee Name,Voor Naam werknemer,
 Goals,Doelen,
-Calculate Total Score,Bereken Totaalscore,
 Total Score (Out of 5),Totale Score (van de 5),
 "Any other remarks, noteworthy effort that should go in the records.","Eventuele andere opmerkingen, noemenswaardig voor in de boekhouding,",
 Appraisal Goal,Beoordeling Doel,
@@ -6599,11 +6588,6 @@
 Reason for Leaving,Reden voor vertrek,
 Leave Encashed?,Verlof verzilverd?,
 Encashment Date,Betalingsdatum,
-Exit Interview Details,Exit Gesprek Details,
-Held On,Heeft plaatsgevonden op,
-Reason for Resignation,Reden voor ontslag,
-Better Prospects,Betere vooruitzichten,
-Health Concerns,Gezondheidszorgen,
 New Workplace,Nieuwe werkplek,
 HR-EAD-.YYYY.-,HR-EAD-.YYYY.-,
 Returned Amount,Geretourneerd bedrag,
@@ -8239,9 +8223,6 @@
 Manufacturers used in Items,Fabrikanten gebruikt in Items,
 Limited to 12 characters,Beperkt tot 12 tekens,
 MAT-MR-.YYYY.-,MAT-MR-.YYYY.-,
-Set Warehouse,Stel Magazijn in,
-Sets 'For Warehouse' in each row of the Items table.,Stelt &#39;Voor magazijn&#39; in in elke rij van de itemtabel.,
-Requested For,Aangevraagd voor,
 Partially Ordered,Gedeeltelijk besteld,
 Transferred,overgedragen,
 % Ordered,% Besteld,
@@ -8690,8 +8671,6 @@
 Select warehouse for material requests,Selecteer magazijn voor materiaalaanvragen,
 Transfer Materials For Warehouse {0},Materiaal overbrengen voor magazijn {0},
 Production Plan Material Request Warehouse,Productieplan Materiaalaanvraag Magazijn,
-Set From Warehouse,Instellen vanuit magazijn,
-Source Warehouse (Material Transfer),Bronmagazijn (materiaaloverdracht),
 Sets 'Source Warehouse' in each row of the items table.,Stelt &#39;Bronmagazijn&#39; in in elke rij van de itemtabel.,
 Sets 'Target Warehouse' in each row of the items table.,Stelt &#39;Target Warehouse&#39; in in elke rij van de itemtabel.,
 Show Cancelled Entries,Toon geannuleerde inzendingen,
@@ -9157,7 +9136,6 @@
 Is Income Tax Component,Is component inkomstenbelasting,
 Component properties and references ,Componenteigenschappen en verwijzingen,
 Additional Salary ,Extra salaris,
-Condtion and formula,Conditie en formule,
 Unmarked days,Ongemarkeerde dagen,
 Absent Days,Afwezige dagen,
 Conditions and Formula variable and example,Voorwaarden en Formule variabele en voorbeeld,
@@ -9444,7 +9422,6 @@
 Please check your Plaid client ID and secret values,Controleer uw Plaid-klant-ID en geheime waarden,
 Bank transaction creation error,Fout bij maken van banktransactie,
 Unit of Measurement,Meet eenheid,
-Row #{}: Selling rate for item {} is lower than its {}. Selling rate should be atleast {},Rij # {}: het verkooppercentage voor artikel {} is lager dan zijn {}. Het verkooppercentage moet minimaal {} zijn,
 Fiscal Year {0} Does Not Exist,Boekjaar {0} bestaat niet,
 Row # {0}: Returned Item {1} does not exist in {2} {3},Rij # {0}: geretourneerd item {1} bestaat niet in {2} {3},
 Valuation type charges can not be marked as Inclusive,Kosten van het taxatietype kunnen niet als inclusief worden gemarkeerd,
@@ -9598,8 +9575,60 @@
 Response Time for {0} priority in row {1} can't be greater than Resolution Time.,Reactietijd voor {0} prioriteit in rij {1} kan niet groter zijn dan Oplossingstijd.,
 {0} is not enabled in {1},{0} is niet ingeschakeld in {1},
 Group by Material Request,Groeperen op materiaalverzoek,
-"Row {0}: For Supplier {0}, Email Address is Required to Send Email",Rij {0}: voor leverancier {0} is e-mailadres vereist om e-mail te verzenden,
 Email Sent to Supplier {0},E-mail verzonden naar leverancier {0},
 "The Access to Request for Quotation From Portal is Disabled. To Allow Access, Enable it in Portal Settings.","De toegang tot offerteaanvraag vanuit de portal is uitgeschakeld. Om toegang toe te staan, schakelt u het in in Portal-instellingen.",
 Supplier Quotation {0} Created,Offerte van leverancier {0} gemaakt,
 Valid till Date cannot be before Transaction Date,Geldig tot Datum kan niet voor Transactiedatum liggen,
+Unlink Advance Payment on Cancellation of Order,Ontkoppel vooruitbetaling bij annulering van bestelling,
+"Simple Python Expression, Example: territory != 'All Territories'","Eenvoudige Python-expressie, voorbeeld: territorium! = &#39;Alle territoria&#39;",
+Sales Contributions and Incentives,Verkoopbijdragen en incentives,
+Sourced by Supplier,Afkomstig van leverancier,
+Total weightage assigned should be 100%.<br>It is {0},Het totale toegewezen gewicht moet 100% zijn.<br> Het is {0},
+Account {0} exists in parent company {1}.,Account {0} bestaat in moederbedrijf {1}.,
+"To overrule this, enable '{0}' in company {1}",Schakel &#39;{0}&#39; in bedrijf {1} in om dit te negeren,
+Invalid condition expression,Ongeldige voorwaarde-uitdrukking,
+Please Select a Company First,Selecteer eerst een bedrijf,
+Please Select Both Company and Party Type First,Selecteer eerst zowel het type bedrijf als partij,
+Provide the invoice portion in percent,Geef het factuurgedeelte op in procenten,
+Give number of days according to prior selection,Geef het aantal dagen op volgens voorafgaande selectie,
+Email Details,E-mailgegevens,
+"Select a greeting for the receiver. E.g. Mr., Ms., etc.","Selecteer een begroeting voor de ontvanger. Bijv. Meneer, mevrouw, etc.",
+Preview Email,Voorbeeld van e-mail bekijken,
+Please select a Supplier,Selecteer een leverancier,
+Supplier Lead Time (days),Doorlooptijd leverancier (dagen),
+"Home, Work, etc.","Thuis, werk, etc.",
+Exit Interview Held On,Exit Interview aangehouden,
+Condition and formula,Staat en formule,
+Sets 'Target Warehouse' in each row of the Items table.,Stelt &#39;Target Warehouse&#39; in in elke rij van de Item-tabel.,
+Sets 'Source Warehouse' in each row of the Items table.,Stelt &#39;Bronmagazijn&#39; in in elke rij van de itemtabel.,
+POS Register,POS-register,
+"Can not filter based on POS Profile, if grouped by POS Profile","Kan niet filteren op basis van POS-profiel, indien gegroepeerd op POS-profiel",
+"Can not filter based on Customer, if grouped by Customer","Kan niet filteren op klant, indien gegroepeerd op klant",
+"Can not filter based on Cashier, if grouped by Cashier","Kan niet filteren op basis van kassier, indien gegroepeerd op kassier",
+Payment Method,Betalingswijze,
+"Can not filter based on Payment Method, if grouped by Payment Method","Kan niet filteren op basis van betalingsmethode, indien gegroepeerd op betalingsmethode",
+Supplier Quotation Comparison,Vergelijking van offertes van leveranciers,
+Price per Unit (Stock UOM),Prijs per stuk (voorraadeenheid),
+Group by Supplier,Groeperen op leverancier,
+Group by Item,Groeperen op item,
+Remember to set {field_label}. It is required by {regulation}.,Vergeet niet om {field_label} in te stellen. Het is vereist door {regelgeving}.,
+Enrollment Date cannot be before the Start Date of the Academic Year {0},Inschrijvingsdatum mag niet voor de startdatum van het academische jaar liggen {0},
+Enrollment Date cannot be after the End Date of the Academic Term {0},Inschrijvingsdatum mag niet na de einddatum van de academische periode zijn {0},
+Enrollment Date cannot be before the Start Date of the Academic Term {0},Inschrijvingsdatum mag niet voor de startdatum van de academische periode liggen {0},
+Posting future transactions are not allowed due to Immutable Ledger,Het boeken van toekomstige transacties is niet toegestaan vanwege Immutable Ledger,
+Future Posting Not Allowed,Toekomstige plaatsing niet toegestaan,
+"To enable Capital Work in Progress Accounting, ","Om Capital Work in Progress Accounting in te schakelen,",
+you must select Capital Work in Progress Account in accounts table,u moet Capital Work in Progress Account selecteren in de rekeningentabel,
+You can also set default CWIP account in Company {},U kunt ook een standaard CWIP-account instellen in Bedrijf {},
+The Request for Quotation can be accessed by clicking on the following button,De offerteaanvraag is toegankelijk door op de volgende knop te klikken,
+Regards,vriendelijke groeten,
+Please click on the following button to set your new password,Klik op de volgende knop om uw nieuwe wachtwoord in te stellen,
+Update Password,Vernieuw wachtwoord,
+Row #{}: Selling rate for item {} is lower than its {}. Selling {} should be atleast {},Rij # {}: het verkooppercentage voor artikel {} is lager dan zijn {}. Verkopen {} zou minstens {} moeten zijn,
+You can alternatively disable selling price validation in {} to bypass this validation.,U kunt ook de verkoopprijsvalidatie uitschakelen in {} om deze validatie te omzeilen.,
+Invalid Selling Price,Ongeldige verkoopprijs,
+Address needs to be linked to a Company. Please add a row for Company in the Links table.,Adres moet aan een bedrijf zijn gekoppeld. Voeg een rij toe voor Bedrijf in de tabel met links.,
+Company Not Linked,Bedrijf niet gekoppeld,
+Import Chart of Accounts from CSV / Excel files,Rekeningschema importeren vanuit CSV / Excel-bestanden,
+Completed Qty cannot be greater than 'Qty to Manufacture',Voltooide hoeveelheid kan niet groter zijn dan &#39;Te vervaardigen aantal&#39;,
+"Row {0}: For Supplier {1}, Email Address is Required to send an email",Rij {0}: voor leverancier {1} is het e-mailadres vereist om een e-mail te verzenden,
diff --git a/erpnext/translations/no.csv b/erpnext/translations/no.csv
index 4ef4d43..7b9b0ac 100644
--- a/erpnext/translations/no.csv
+++ b/erpnext/translations/no.csv
@@ -521,7 +521,6 @@
 Chargeble,chargeble,
 Charges are updated in Purchase Receipt against each item,Kostnader er oppdatert i Purchase Mottak mot hvert element,
 "Charges will be distributed proportionately based on item qty or amount, as per your selection","Kostnader vil bli fordelt forholdsmessig basert på element stk eller beløp, som per ditt valg",
-Chart Of Accounts,Konto,
 Chart of Cost Centers,Plan Kostnadssteder,
 Check all,Sjekk alt,
 Checkout,Sjekk ut,
@@ -581,7 +580,6 @@
 Compensatory Off,Kompenserende Off,
 Compensatory leave request days not in valid holidays,Kompensasjonsorlov forespørselsdager ikke i gyldige helligdager,
 Complaint,Klage,
-Completed Qty can not be greater than 'Qty to Manufacture',Fullført Antall kan ikke være større enn &quot;Antall å Manufacture &#39;,
 Completion Date,Ferdigstillelse Dato,
 Computer,Datamaskin,
 Condition,Tilstand,
@@ -2033,7 +2031,6 @@
 Please select Charge Type first,Vennligst velg Charge Type først,
 Please select Company,Vennligst velg selskapet,
 Please select Company and Designation,Vennligst velg Firma og Betegnelse,
-Please select Company and Party Type first,Vennligst velg først selskapet og Party Type,
 Please select Company and Posting Date to getting entries,Vennligst velg Company og Posting Date for å få oppføringer,
 Please select Company first,Vennligst velg selskapet først,
 Please select Completion Date for Completed Asset Maintenance Log,Vennligst velg sluttdato for fullført aktivitetsvedlikeholdslogg,
@@ -2980,7 +2977,6 @@
 The name of your company for which you are setting up this system.,Navnet på firmaet som du setter opp dette systemet.,
 The number of shares and the share numbers are inconsistent,Antall aksjer og aksjenumrene er inkonsekvente,
 The payment gateway account in plan {0} is different from the payment gateway account in this payment request,Betalingsgatewaykontoen i plan {0} er forskjellig fra betalingsgatewaykontoen i denne betalingsanmodningen,
-The request for quotation can be accessed by clicking on the following link,Anmodningen om sitatet kan nås ved å klikke på følgende link,
 The selected BOMs are not for the same item,De valgte stykklister er ikke for den samme varen,
 The selected item cannot have Batch,Den valgte elementet kan ikke ha Batch,
 The seller and the buyer cannot be the same,Selgeren og kjøperen kan ikke være det samme,
@@ -3130,7 +3126,6 @@
 Total flexible benefit component amount {0} should not be less than max benefits {1},Det totale beløpet for fleksibel ytelse {0} skal ikke være mindre enn maksimalt utbytte {1},
 Total hours: {0},Antall timer: {0},
 Total leaves allocated is mandatory for Leave Type {0},Totalt antall permisjoner er obligatorisk for permisjonstype {0},
-Total weightage assigned should be 100%. It is {0},Total weightage tilordnet skal være 100%. Det er {0},
 Total working hours should not be greater than max working hours {0},Samlet arbeidstid må ikke være større enn maks arbeidstid {0},
 Total {0} ({1}),Totalt {0} ({1}),
 "Total {0} for all items is zero, may be you should change 'Distribute Charges Based On'","Totalt {0} for alle elementer er null, kan være du bør endre &#39;Fordel Avgifter basert på&#39;",
@@ -3544,7 +3539,6 @@
 Company field is required,Firmafelt er påkrevd,
 Creating Dimensions...,Oppretter dimensjoner ...,
 Duplicate entry against the item code {0} and manufacturer {1},Dupliser oppføring mot varekoden {0} og produsenten {1},
-Import Chart Of Accounts from CSV / Excel files,Importer oversikt over kontoer fra CSV / Excel-filer,
 Invalid GSTIN! The input you've entered doesn't match the GSTIN format for UIN Holders or Non-Resident OIDAR Service Providers,Ugyldig GSTIN! Inputene du har skrevet inn samsvarer ikke med GSTIN-formatet for UIN-innehavere eller ikke-bosatte OIDAR-tjenesteleverandører,
 Invoice Grand Total,Faktura Grand Total,
 Last carbon check date cannot be a future date,Siste dato for karbonkontroll kan ikke være en fremtidig dato,
@@ -3921,7 +3915,6 @@
 Plaid public token error,Plaid public token error,
 Plaid transactions sync error,Feil i synkronisering av rutete transaksjoner,
 Please check the error log for details about the import errors,Kontroller feilloggen for detaljer om importfeilene,
-Please click on the following link to set your new password,Vennligst klikk på følgende link for å sette et nytt passord,
 Please create <b>DATEV Settings</b> for Company <b>{}</b>.,Opprett <b>DATEV-innstillinger</b> for selskapet <b>{}</b> .,
 Please create adjustment Journal Entry for amount {0} ,Opprett justeringsjournalregistrering for beløp {0},
 Please do not create more than 500 items at a time,Ikke lag mer enn 500 elementer om gangen,
@@ -3997,6 +3990,7 @@
 Release date must be in the future,Utgivelsesdato må være i fremtiden,
 Relieving Date must be greater than or equal to Date of Joining,Relieving Date må være større enn eller lik dato for tiltredelse,
 Rename,Gi nytt navn,
+Rename Not Allowed,Gi nytt navn ikke tillatt,
 Repayment Method is mandatory for term loans,Tilbakebetalingsmetode er obligatorisk for lån,
 Repayment Start Date is mandatory for term loans,Startdato for tilbakebetaling er obligatorisk for terminlån,
 Report Item,Rapporter varen,
@@ -4043,7 +4037,6 @@
 Select All,Velg Alle,
 Select Difference Account,Velg Differanse-konto,
 Select a Default Priority.,Velg en standardprioritet.,
-Select a Supplier from the Default Supplier List of the items below.,Velg en leverandør fra standardleverandørlisten over elementene nedenfor.,
 Select a company,Velg et selskap,
 Select finance book for the item {0} at row {1},Velg økonomibok for varen {0} på rad {1},
 Select only one Priority as Default.,Velg bare én prioritet som standard.,
@@ -4247,7 +4240,6 @@
 Actual ,Faktiske,
 Add to cart,Legg til i handlevogn,
 Budget,Budsjett,
-Chart Of Accounts Importer,Kontoplan for importør,
 Chart of Accounts,Kontooversikt,
 Customer database.,Kunde Database.,
 Days Since Last order,Dager siden siste Bestill,
@@ -4546,7 +4538,6 @@
 Check Supplier Invoice Number Uniqueness,Sjekk Leverandør fakturanummer Unikhet,
 Make Payment via Journal Entry,Utfør betaling via bilagsregistrering,
 Unlink Payment on Cancellation of Invoice,Oppheve koblingen Betaling ved kansellering av faktura,
-Unlink Advance Payment on Cancelation of Order,Fjern koblingen på forskudd ved avbestilling av ordre,
 Book Asset Depreciation Entry Automatically,Bokføring av aktivavskrivninger automatisk,
 Automatically Add Taxes and Charges from Item Tax Template,Legg automatisk til skatter og avgifter fra varighetsskattmal,
 Automatically Fetch Payment Terms,Hent automatisk betalingsbetingelser,
@@ -4940,7 +4931,6 @@
 POS Customer Group,POS Kundegruppe,
 POS Field,POS-felt,
 POS Item Group,POS Varegruppe,
-[Select],[Velg],
 Company Address,Firma adresse,
 Update Stock,Oppdater Stock,
 Ignore Pricing Rule,Ignorer Pricing Rule,
@@ -6481,7 +6471,6 @@
 Appraisal Template,Appraisal Mal,
 For Employee Name,For Employee Name,
 Goals,Mål,
-Calculate Total Score,Beregn Total Score,
 Total Score (Out of 5),Total poengsum (av 5),
 "Any other remarks, noteworthy effort that should go in the records.","Eventuelle andre bemerkninger, bemerkelsesverdig innsats som bør gå i postene.",
 Appraisal Goal,Appraisal Goal,
@@ -6599,11 +6588,6 @@
 Reason for Leaving,Grunn til å forlate,
 Leave Encashed?,Permisjon encashed?,
 Encashment Date,Encashment Dato,
-Exit Interview Details,Exit Intervju Detaljer,
-Held On,Avholdt,
-Reason for Resignation,Grunnen til Resignasjon,
-Better Prospects,Bedre utsikter,
-Health Concerns,Helse Bekymringer,
 New Workplace,Nye arbeidsplassen,
 HR-EAD-.YYYY.-,HR-EAD-.YYYY.-,
 Returned Amount,Returnert beløp,
@@ -8239,9 +8223,6 @@
 Manufacturers used in Items,Produsenter som brukes i Items,
 Limited to 12 characters,Begrenset til 12 tegn,
 MAT-MR-.YYYY.-,MAT-MR-.YYYY.-,
-Set Warehouse,Sett lager,
-Sets 'For Warehouse' in each row of the Items table.,Angir &quot;For lager&quot; i hver rad i varetabellen.,
-Requested For,Spurt For,
 Partially Ordered,Delvis bestilt,
 Transferred,overført,
 % Ordered,% Bestilt,
@@ -8690,8 +8671,6 @@
 Select warehouse for material requests,Velg lager for materialforespørsler,
 Transfer Materials For Warehouse {0},Overfør materiale til lager {0},
 Production Plan Material Request Warehouse,Produksjonsplan Materialforespørsel Lager,
-Set From Warehouse,Sett fra lager,
-Source Warehouse (Material Transfer),Source Warehouse (Material Transfer),
 Sets 'Source Warehouse' in each row of the items table.,Angir &#39;Source Warehouse&#39; i hver rad i varetabellen.,
 Sets 'Target Warehouse' in each row of the items table.,Angir &#39;Target Warehouse&#39; i hver rad i varetabellen.,
 Show Cancelled Entries,Vis kansellerte oppføringer,
@@ -9157,7 +9136,6 @@
 Is Income Tax Component,Er inntektsskattkomponent,
 Component properties and references ,Komponentegenskaper og referanser,
 Additional Salary ,Tilleggslønn,
-Condtion and formula,Kondisjon og formel,
 Unmarked days,Umerkede dager,
 Absent Days,Fraværende dager,
 Conditions and Formula variable and example,Betingelser og formelvariabel og eksempel,
@@ -9444,7 +9422,6 @@
 Please check your Plaid client ID and secret values,Kontroller Plaid-klient-ID og hemmelige verdier,
 Bank transaction creation error,Feil ved oppretting av banktransaksjoner,
 Unit of Measurement,Måleenhet,
-Row #{}: Selling rate for item {} is lower than its {}. Selling rate should be atleast {},Rad nr. {}: Salgsfrekvensen for varen {} er lavere enn {}. Salgsfrekvensen bør være minst {},
 Fiscal Year {0} Does Not Exist,Regnskapsåret {0} eksisterer ikke,
 Row # {0}: Returned Item {1} does not exist in {2} {3},Rad nr. {0}: Returnert vare {1} finnes ikke i {2} {3},
 Valuation type charges can not be marked as Inclusive,Kostnader for verdsettelse kan ikke merkes som inkluderende,
@@ -9598,8 +9575,60 @@
 Response Time for {0} priority in row {1} can't be greater than Resolution Time.,Svartiden for {0} prioritet i rad {1} kan ikke være lengre enn oppløsningstid.,
 {0} is not enabled in {1},{0} er ikke aktivert i {1},
 Group by Material Request,Gruppere etter materialforespørsel,
-"Row {0}: For Supplier {0}, Email Address is Required to Send Email",Rad {0}: For leverandør {0} kreves e-postadresse for å sende e-post,
 Email Sent to Supplier {0},E-post sendt til leverandør {0},
 "The Access to Request for Quotation From Portal is Disabled. To Allow Access, Enable it in Portal Settings.","Tilgangen til forespørsel om tilbud fra portalen er deaktivert. For å tillate tilgang, aktiver det i Portal Settings.",
 Supplier Quotation {0} Created,Tilbud fra leverandør {0} Opprettet,
 Valid till Date cannot be before Transaction Date,Gyldig till-dato kan ikke være før transaksjonsdato,
+Unlink Advance Payment on Cancellation of Order,Fjern tilknytningen av forskuddsbetaling ved kansellering av ordren,
+"Simple Python Expression, Example: territory != 'All Territories'","Enkelt Python-uttrykk, Eksempel: territorium! = &#39;Alle territorier&#39;",
+Sales Contributions and Incentives,Salgsbidrag og insentiver,
+Sourced by Supplier,Henter fra leverandør,
+Total weightage assigned should be 100%.<br>It is {0},Total tildelt vekt skal være 100%.<br> Det er {0},
+Account {0} exists in parent company {1}.,Kontoen {0} finnes i morselskapet {1}.,
+"To overrule this, enable '{0}' in company {1}","For å overstyre dette, aktiver &quot;{0}&quot; i firmaet {1}",
+Invalid condition expression,Ugyldig tilstandsuttrykk,
+Please Select a Company First,Velg et selskap først,
+Please Select Both Company and Party Type First,Velg både selskap og festtype først,
+Provide the invoice portion in percent,Oppgi fakturadelen i prosent,
+Give number of days according to prior selection,Oppgi antall dager i henhold til forhåndsvalg,
+Email Details,E-postdetaljer,
+"Select a greeting for the receiver. E.g. Mr., Ms., etc.","Velg en hilsen til mottakeren. F.eks Mr., Ms., etc.",
+Preview Email,Forhåndsvisning av e-post,
+Please select a Supplier,Velg en leverandør,
+Supplier Lead Time (days),Leveringstid (dager),
+"Home, Work, etc.","Hjem, arbeid osv.",
+Exit Interview Held On,Avslutt intervju holdt,
+Condition and formula,Tilstand og formel,
+Sets 'Target Warehouse' in each row of the Items table.,Angir &#39;Target Warehouse&#39; i hver rad i Artikeltabellen.,
+Sets 'Source Warehouse' in each row of the Items table.,Angir &#39;Source Warehouse&#39; i hver rad i Items-tabellen.,
+POS Register,POS-register,
+"Can not filter based on POS Profile, if grouped by POS Profile","Kan ikke filtrere basert på POS-profil, hvis gruppert etter POS-profil",
+"Can not filter based on Customer, if grouped by Customer","Kan ikke filtrere basert på kunde, hvis gruppert etter kunde",
+"Can not filter based on Cashier, if grouped by Cashier","Kan ikke filtrere basert på kassereren, hvis gruppert etter kassereren",
+Payment Method,Betalingsmetode,
+"Can not filter based on Payment Method, if grouped by Payment Method","Kan ikke filtrere basert på betalingsmåte, hvis gruppert etter betalingsmåte",
+Supplier Quotation Comparison,Sammenligning av tilbud på leverandører,
+Price per Unit (Stock UOM),Pris per enhet (lager UOM),
+Group by Supplier,Grupper etter leverandør,
+Group by Item,Gruppere etter vare,
+Remember to set {field_label}. It is required by {regulation}.,Husk å angi {field_label}. Det kreves av {regulering}.,
+Enrollment Date cannot be before the Start Date of the Academic Year {0},Påmeldingsdato kan ikke være før startdatoen for det akademiske året {0},
+Enrollment Date cannot be after the End Date of the Academic Term {0},Påmeldingsdato kan ikke være etter sluttdatoen for den akademiske perioden {0},
+Enrollment Date cannot be before the Start Date of the Academic Term {0},Påmeldingsdato kan ikke være før startdatoen for fagperioden {0},
+Posting future transactions are not allowed due to Immutable Ledger,Det er ikke tillatt å legge ut fremtidige transaksjoner på grunn av Immutable Ledger,
+Future Posting Not Allowed,Fremtidig innleggelse er ikke tillatt,
+"To enable Capital Work in Progress Accounting, ","For å aktivere Capital Work in Progress Accounting,",
+you must select Capital Work in Progress Account in accounts table,du må velge Capital Work in Progress-konto i kontotabellen,
+You can also set default CWIP account in Company {},Du kan også angi standard CWIP-konto i selskapet {},
+The Request for Quotation can be accessed by clicking on the following button,Forespørsel om tilbud kan nås ved å klikke på følgende knapp,
+Regards,Hilsen,
+Please click on the following button to set your new password,Klikk på følgende knapp for å angi ditt nye passord,
+Update Password,Oppdater passord,
+Row #{}: Selling rate for item {} is lower than its {}. Selling {} should be atleast {},Rad nr. {}: Salgsfrekvensen for varen {} er lavere enn {}. Selge {} skal være minst {},
+You can alternatively disable selling price validation in {} to bypass this validation.,Du kan alternativt deaktivere validering av salgspris i {} for å omgå denne valideringen.,
+Invalid Selling Price,Ugyldig salgspris,
+Address needs to be linked to a Company. Please add a row for Company in the Links table.,Adressen må være knyttet til et selskap. Legg til en rad for selskapet i koblingstabellen.,
+Company Not Linked,Firma ikke tilknyttet,
+Import Chart of Accounts from CSV / Excel files,Importer kontoplan fra CSV / Excel-filer,
+Completed Qty cannot be greater than 'Qty to Manufacture',Fullført antall kan ikke være større enn &#39;Antall å produsere&#39;,
+"Row {0}: For Supplier {1}, Email Address is Required to send an email",Rad {0}: For leverandør {1} kreves e-postadresse for å sende en e-post,
diff --git a/erpnext/translations/pl.csv b/erpnext/translations/pl.csv
index 2a9060d..1f492e5 100644
--- a/erpnext/translations/pl.csv
+++ b/erpnext/translations/pl.csv
@@ -521,7 +521,6 @@
 Chargeble,Chargeble,
 Charges are updated in Purchase Receipt against each item,Opłaty są aktualizowane w ZAKUPU każdej pozycji,
 "Charges will be distributed proportionately based on item qty or amount, as per your selection","Koszty zostaną rozdzielone proporcjonalnie na podstawie Ilość pozycji lub kwoty, jak na swój wybór",
-Chart Of Accounts,Plan kont,
 Chart of Cost Centers,Struktura kosztów (MPK),
 Check all,Zaznacz wszystkie,
 Checkout,Sprawdzić,
@@ -581,7 +580,6 @@
 Compensatory Off,,
 Compensatory leave request days not in valid holidays,Dni urlopu wyrównawczego nie zawierają się w zakresie prawidłowych dniach świątecznych,
 Complaint,Skarga,
-Completed Qty can not be greater than 'Qty to Manufacture',"Zakończono Ilość nie może być większa niż ""Ilość w produkcji""",
 Completion Date,Data ukończenia,
 Computer,Komputer,
 Condition,Stan,
@@ -2033,7 +2031,6 @@
 Please select Charge Type first,Najpierw wybierz typ opłaty,
 Please select Company,Proszę wybrać firmę,
 Please select Company and Designation,Wybierz firmę i oznaczenie,
-Please select Company and Party Type first,"Najpierw wybierz typ firmy, a Party",
 Please select Company and Posting Date to getting entries,"Wybierz Firmę i Data księgowania, aby uzyskać wpisy",
 Please select Company first,Najpierw wybierz firmę,
 Please select Completion Date for Completed Asset Maintenance Log,Proszę wybrać opcję Data zakończenia dla ukończonego dziennika konserwacji zasobów,
@@ -2980,7 +2977,6 @@
 The name of your company for which you are setting up this system.,Nazwa firmy / organizacji dla której uruchamiasz niniejszy system.,
 The number of shares and the share numbers are inconsistent,Liczba akcji i liczby akcji są niespójne,
 The payment gateway account in plan {0} is different from the payment gateway account in this payment request,Rachunek bramy płatniczej w planie {0} różni się od konta bramy płatności w tym żądaniu płatności,
-The request for quotation can be accessed by clicking on the following link,Wniosek o cytat można uzyskać klikając na poniższy link,
 The selected BOMs are not for the same item,Wybrane LM nie są na tej samej pozycji,
 The selected item cannot have Batch,Wybrany element nie może mieć Batch,
 The seller and the buyer cannot be the same,Sprzedawca i kupujący nie mogą być tacy sami,
@@ -3130,7 +3126,6 @@
 Total flexible benefit component amount {0} should not be less than max benefits {1},Całkowita kwota elastycznego składnika świadczeń {0} nie powinna być mniejsza niż maksymalna korzyść {1},
 Total hours: {0},Całkowita liczba godzin: {0},
 Total leaves allocated is mandatory for Leave Type {0},Całkowita liczba przydzielonych Nieobecności jest obowiązkowa dla Typu Urlopu {0},
-Total weightage assigned should be 100%. It is {0},Całkowita przypisana waga powinna wynosić 100%. Jest {0},
 Total working hours should not be greater than max working hours {0},Całkowita liczba godzin pracy nie powinna być większa niż max godzinach pracy {0},
 Total {0} ({1}),Razem {0} ({1}),
 "Total {0} for all items is zero, may be you should change 'Distribute Charges Based On'","Razem {0} dla wszystkich elementów wynosi zero, może trzeba zmienić „Dystrybucja opłat na podstawie”",
@@ -3544,7 +3539,6 @@
 Company field is required,Wymagane jest pole firmowe,
 Creating Dimensions...,Tworzenie wymiarów ...,
 Duplicate entry against the item code {0} and manufacturer {1},Zduplikowany wpis względem kodu produktu {0} i producenta {1},
-Import Chart Of Accounts from CSV / Excel files,Importuj wykresy kont z plików CSV / Excel,
 Invalid GSTIN! The input you've entered doesn't match the GSTIN format for UIN Holders or Non-Resident OIDAR Service Providers,Nieprawidłowy GSTIN! Wprowadzone dane nie odpowiadają formatowi GSTIN dla posiadaczy UIN lub nierezydentów dostawców usług OIDAR,
 Invoice Grand Total,Faktura Grand Total,
 Last carbon check date cannot be a future date,Data ostatniej kontroli emisji nie może być datą przyszłą,
@@ -3921,7 +3915,6 @@
 Plaid public token error,Błąd publicznego znacznika w kratkę,
 Plaid transactions sync error,Błąd synchronizacji transakcji Plaid,
 Please check the error log for details about the import errors,"Sprawdź dziennik błędów, aby uzyskać szczegółowe informacje na temat błędów importu",
-Please click on the following link to set your new password,"Proszę kliknąć na poniższy link, aby ustawić nowe hasło",
 Please create <b>DATEV Settings</b> for Company <b>{}</b>.,<b>Utwórz ustawienia DATEV</b> dla firmy <b>{}</b> .,
 Please create adjustment Journal Entry for amount {0} ,Utwórz korektę Zapis księgowy dla kwoty {0},
 Please do not create more than 500 items at a time,Nie twórz więcej niż 500 pozycji naraz,
@@ -3997,6 +3990,7 @@
 Release date must be in the future,Data wydania musi być w przyszłości,
 Relieving Date must be greater than or equal to Date of Joining,Data zwolnienia musi być większa lub równa dacie przystąpienia,
 Rename,Zmień nazwę,
+Rename Not Allowed,Zmień nazwę na Niedozwolone,
 Repayment Method is mandatory for term loans,Metoda spłaty jest obowiązkowa w przypadku pożyczek terminowych,
 Repayment Start Date is mandatory for term loans,Data rozpoczęcia spłaty jest obowiązkowa w przypadku pożyczek terminowych,
 Report Item,Zgłoś przedmiot,
@@ -4043,7 +4037,6 @@
 Select All,Wybierz wszystko,
 Select Difference Account,Wybierz konto różnicy,
 Select a Default Priority.,Wybierz domyślny priorytet.,
-Select a Supplier from the Default Supplier List of the items below.,Wybierz dostawcę z domyślnej listy dostawców poniżej.,
 Select a company,Wybierz firmę,
 Select finance book for the item {0} at row {1},Wybierz księgę finansową dla pozycji {0} w wierszu {1},
 Select only one Priority as Default.,Wybierz tylko jeden priorytet jako domyślny.,
@@ -4247,7 +4240,6 @@
 Actual ,Właściwy,
 Add to cart,Dodaj do koszyka,
 Budget,Budżet,
-Chart Of Accounts Importer,Importer wykresów kont,
 Chart of Accounts,Plan kont,
 Customer database.,Baza danych klientów.,
 Days Since Last order,Dni od ostatniego zamówienia,
@@ -4546,7 +4538,6 @@
 Check Supplier Invoice Number Uniqueness,"Sprawdź, czy numer faktury dostawcy jest unikalny",
 Make Payment via Journal Entry,Wykonywanie płatności za pośrednictwem Zapisów Księgowych dziennika,
 Unlink Payment on Cancellation of Invoice,Odłączanie Przedpłata na Anulowanie faktury,
-Unlink Advance Payment on Cancelation of Order,Odłącz płatność zaliczkową przy anulowaniu zamówienia,
 Book Asset Depreciation Entry Automatically,Automatycznie wprowadź wartość księgowania depozytu księgowego aktywów,
 Automatically Add Taxes and Charges from Item Tax Template,Automatycznie dodawaj podatki i opłaty z szablonu podatku od towarów,
 Automatically Fetch Payment Terms,Automatycznie pobierz warunki płatności,
@@ -4940,7 +4931,6 @@
 POS Customer Group,POS Grupa klientów,
 POS Field,Pole POS,
 POS Item Group,POS Pozycja Grupy,
-[Select],[Wybierz],
 Company Address,adres spółki,
 Update Stock,Aktualizuj Stan,
 Ignore Pricing Rule,Ignoruj zasadę ustalania cen,
@@ -6481,7 +6471,6 @@
 Appraisal Template,Szablon oceny,
 For Employee Name,Dla Imienia Pracownika,
 Goals,Cele,
-Calculate Total Score,Oblicz całkowity wynik,
 Total Score (Out of 5),Łączny wynik (w skali do 5),
 "Any other remarks, noteworthy effort that should go in the records.","Wszelkie inne uwagi, zauważyć, że powinien iść nakładu w ewidencji.",
 Appraisal Goal,Cel oceny,
@@ -6599,11 +6588,6 @@
 Reason for Leaving,Powód odejścia,
 Leave Encashed?,"Jesteś pewien, że chcesz wyjść z Wykupinych?",
 Encashment Date,Data Inkaso,
-Exit Interview Details,Wyjdź z szczegółów wywiadu,
-Held On,W dniach,
-Reason for Resignation,Powód rezygnacji,
-Better Prospects,Lepiej rokujący możliwi Klienci,
-Health Concerns,Problemy Zdrowotne,
 New Workplace,Nowe Miejsce Pracy,
 HR-EAD-.YYYY.-,HR-EAD-.RRRR.-,
 Returned Amount,Zwrócona kwota,
@@ -8239,9 +8223,6 @@
 Manufacturers used in Items,Producenci używane w pozycji,
 Limited to 12 characters,Ograniczona do 12 znaków,
 MAT-MR-.YYYY.-,MAT-MR-.RRRR.-,
-Set Warehouse,Ustaw magazyn,
-Sets 'For Warehouse' in each row of the Items table.,Ustawia „Dla magazynu” w każdym wierszu tabeli Towary.,
-Requested For,Prośba o,
 Partially Ordered,Częściowo zamówione,
 Transferred,Przeniesiony,
 % Ordered,% Zamówione,
@@ -8690,8 +8671,6 @@
 Select warehouse for material requests,Wybierz magazyn dla zapytań materiałowych,
 Transfer Materials For Warehouse {0},Przenieś materiały do magazynu {0},
 Production Plan Material Request Warehouse,Plan produkcji Magazyn żądań materiałowych,
-Set From Warehouse,Ustaw z magazynu,
-Source Warehouse (Material Transfer),Magazyn źródłowy (transfer materiałów),
 Sets 'Source Warehouse' in each row of the items table.,Ustawia „Magazyn źródłowy” w każdym wierszu tabeli towarów.,
 Sets 'Target Warehouse' in each row of the items table.,Ustawia „Magazyn docelowy” w każdym wierszu tabeli towarów.,
 Show Cancelled Entries,Pokaż anulowane wpisy,
@@ -9157,7 +9136,6 @@
 Is Income Tax Component,Składnik podatku dochodowego,
 Component properties and references ,Właściwości i odniesienia komponentów,
 Additional Salary ,Dodatkowe wynagrodzenie,
-Condtion and formula,Warunek i formuła,
 Unmarked days,Nieoznakowane dni,
 Absent Days,Nieobecne dni,
 Conditions and Formula variable and example,Warunki i zmienna formuły oraz przykład,
@@ -9444,7 +9422,6 @@
 Please check your Plaid client ID and secret values,Sprawdź identyfikator klienta Plaid i tajne wartości,
 Bank transaction creation error,Błąd tworzenia transakcji bankowej,
 Unit of Measurement,Jednostka miary,
-Row #{}: Selling rate for item {} is lower than its {}. Selling rate should be atleast {},Wiersz nr {}: współczynnik sprzedaży dla przedmiotu {} jest niższy niż jego {}. Wskaźnik sprzedaży powinien wynosić co najmniej {},
 Fiscal Year {0} Does Not Exist,Rok podatkowy {0} nie istnieje,
 Row # {0}: Returned Item {1} does not exist in {2} {3},Wiersz nr {0}: zwrócona pozycja {1} nie istnieje w {2} {3},
 Valuation type charges can not be marked as Inclusive,Opłaty związane z rodzajem wyceny nie mogą być oznaczone jako zawierające,
@@ -9598,8 +9575,60 @@
 Response Time for {0} priority in row {1} can't be greater than Resolution Time.,Czas odpowiedzi dla {0} priorytetu w wierszu {1} nie może być dłuższy niż czas rozwiązania.,
 {0} is not enabled in {1},{0} nie jest włączony w {1},
 Group by Material Request,Grupuj według żądania materiału,
-"Row {0}: For Supplier {0}, Email Address is Required to Send Email",Wiersz {0}: W przypadku dostawcy {0} do wysłania wiadomości e-mail wymagany jest adres e-mail,
 Email Sent to Supplier {0},Wiadomość e-mail wysłana do dostawcy {0},
 "The Access to Request for Quotation From Portal is Disabled. To Allow Access, Enable it in Portal Settings.","Dostęp do zapytania ofertowego z portalu jest wyłączony. Aby zezwolić na dostęp, włącz go w ustawieniach portalu.",
 Supplier Quotation {0} Created,Oferta dostawcy {0} została utworzona,
 Valid till Date cannot be before Transaction Date,Data ważności do nie może być wcześniejsza niż data transakcji,
+Unlink Advance Payment on Cancellation of Order,Odłącz przedpłatę przy anulowaniu zamówienia,
+"Simple Python Expression, Example: territory != 'All Territories'","Proste wyrażenie w Pythonie, przykład: terytorium! = &#39;Wszystkie terytoria&#39;",
+Sales Contributions and Incentives,Składki na sprzedaż i zachęty,
+Sourced by Supplier,Źródło: Dostawca,
+Total weightage assigned should be 100%.<br>It is {0},Łączna przypisana waga powinna wynosić 100%.<br> To jest {0},
+Account {0} exists in parent company {1}.,Konto {0} istnieje w firmie macierzystej {1}.,
+"To overrule this, enable '{0}' in company {1}","Aby to zmienić, włącz „{0}” w firmie {1}",
+Invalid condition expression,Nieprawidłowe wyrażenie warunku,
+Please Select a Company First,Najpierw wybierz firmę,
+Please Select Both Company and Party Type First,Najpierw wybierz firmę i typ strony,
+Provide the invoice portion in percent,Podaj część faktury w procentach,
+Give number of days according to prior selection,Podaj liczbę dni według wcześniejszego wyboru,
+Email Details,Szczegóły wiadomości e-mail,
+"Select a greeting for the receiver. E.g. Mr., Ms., etc.","Wybierz powitanie dla odbiorcy. Np. Pan, Pani itp.",
+Preview Email,Podgląd wiadomości e-mail,
+Please select a Supplier,Wybierz dostawcę,
+Supplier Lead Time (days),Czas oczekiwania dostawcy (dni),
+"Home, Work, etc.","Dom, praca itp.",
+Exit Interview Held On,Zakończ rozmowę kwalifikacyjną wstrzymaną,
+Condition and formula,Stan i formuła,
+Sets 'Target Warehouse' in each row of the Items table.,Ustawia „Magazyn docelowy” w każdym wierszu tabeli Towary.,
+Sets 'Source Warehouse' in each row of the Items table.,Ustawia „Magazyn źródłowy” w każdym wierszu tabeli Towary.,
+POS Register,Rejestr POS,
+"Can not filter based on POS Profile, if grouped by POS Profile","Nie można filtrować na podstawie profilu POS, jeśli są pogrupowane według profilu POS",
+"Can not filter based on Customer, if grouped by Customer","Nie można filtrować na podstawie klienta, jeśli jest pogrupowany według klienta",
+"Can not filter based on Cashier, if grouped by Cashier","Nie można filtrować na podstawie Kasjera, jeśli jest pogrupowane według Kasjera",
+Payment Method,Metoda płatności,
+"Can not filter based on Payment Method, if grouped by Payment Method","Nie można filtrować na podstawie metody płatności, jeśli są pogrupowane według metody płatności",
+Supplier Quotation Comparison,Porównanie ofert dostawców,
+Price per Unit (Stock UOM),Cena za jednostkę (JM z magazynu),
+Group by Supplier,Grupuj według dostawcy,
+Group by Item,Grupuj według pozycji,
+Remember to set {field_label}. It is required by {regulation}.,"Pamiętaj, aby ustawić {field_label}. Jest to wymagane przez {przepis}.",
+Enrollment Date cannot be before the Start Date of the Academic Year {0},Data rejestracji nie może być wcześniejsza niż data rozpoczęcia roku akademickiego {0},
+Enrollment Date cannot be after the End Date of the Academic Term {0},Data rejestracji nie może być późniejsza niż data zakończenia okresu akademickiego {0},
+Enrollment Date cannot be before the Start Date of the Academic Term {0},Data rejestracji nie może być wcześniejsza niż data rozpoczęcia semestru akademickiego {0},
+Posting future transactions are not allowed due to Immutable Ledger,Księgowanie przyszłych transakcji jest niedozwolone z powodu niezmiennej księgi,
+Future Posting Not Allowed,Niedozwolone publikowanie w przyszłości,
+"To enable Capital Work in Progress Accounting, ","Aby włączyć księgowość produkcji w toku,",
+you must select Capital Work in Progress Account in accounts table,w tabeli kont należy wybrać Rachunek kapitałowy w toku,
+You can also set default CWIP account in Company {},Możesz także ustawić domyślne konto CWIP w firmie {},
+The Request for Quotation can be accessed by clicking on the following button,"Dostęp do zapytania ofertowego można uzyskać, klikając poniższy przycisk",
+Regards,pozdrowienia,
+Please click on the following button to set your new password,"Kliknij poniższy przycisk, aby ustawić nowe hasło",
+Update Password,Aktualizować hasło,
+Row #{}: Selling rate for item {} is lower than its {}. Selling {} should be atleast {},Wiersz nr {}: współczynnik sprzedaży dla przedmiotu {} jest niższy niż jego {}. Sprzedawanie {} powinno wynosić co najmniej {},
+You can alternatively disable selling price validation in {} to bypass this validation.,"Alternatywnie możesz wyłączyć weryfikację ceny sprzedaży w {}, aby ominąć tę weryfikację.",
+Invalid Selling Price,Nieprawidłowa cena sprzedaży,
+Address needs to be linked to a Company. Please add a row for Company in the Links table.,Adres musi być powiązany z firmą. Dodaj wiersz Firma w tabeli Łącza.,
+Company Not Linked,Firma niepowiązana,
+Import Chart of Accounts from CSV / Excel files,Importuj plan kont z plików CSV / Excel,
+Completed Qty cannot be greater than 'Qty to Manufacture',Ukończona ilość nie może być większa niż „Ilość do wyprodukowania”,
+"Row {0}: For Supplier {1}, Email Address is Required to send an email",Wiersz {0}: W przypadku dostawcy {1} do wysłania wiadomości e-mail wymagany jest adres e-mail,
diff --git a/erpnext/translations/ps.csv b/erpnext/translations/ps.csv
index cd9fca7..4d57f87 100644
--- a/erpnext/translations/ps.csv
+++ b/erpnext/translations/ps.csv
@@ -521,7 +521,6 @@
 Chargeble,د چارج وړ,
 Charges are updated in Purchase Receipt against each item,په تور د هري برخي په وړاندې په رانيول رسيد تازه دي,
 "Charges will be distributed proportionately based on item qty or amount, as per your selection",په تور به د خپرولو په متناسب ډول پر توکی qty يا اندازه وي، ستاسو د انتخاب په هر توګه,
-Chart Of Accounts,د حسابونو چارټ,
 Chart of Cost Centers,د لګښت د مرکزونو چارت,
 Check all,ټول وګوره,
 Checkout,بشپړ ی وګوره,
@@ -581,7 +580,6 @@
 Compensatory Off,د معاوضې پړاو,
 Compensatory leave request days not in valid holidays,د معاوضې غوښتنې غوښتنه غوښتنه د اعتبار وړ رخصتیو کې نه دي,
 Complaint,شکایت,
-Completed Qty can not be greater than 'Qty to Manufacture',بشپړ Qty نه شي کولای په پرتله &#39;Qty تولید&#39; وي,
 Completion Date,د بشپړیدلو نیټه,
 Computer,کمپيوټر,
 Condition,حالت,
@@ -2033,7 +2031,6 @@
 Please select Charge Type first,مهرباني وکړئ لومړی د ټاکلو مسؤوليت په ډول,
 Please select Company,مهرباني وکړئ د شرکت وټاکئ,
 Please select Company and Designation,مهرباني وکړئ د شرکت او اعلامیه غوره کړئ,
-Please select Company and Party Type first,لطفا د شرکت او د ګوند ډول لومړی انتخاب,
 Please select Company and Posting Date to getting entries,مهرباني وکړئ د شرکتونو او لیکنو نیټه وټاکئ تر څو ثبتات ترلاسه کړي,
 Please select Company first,مهرباني غوره شرکت لومړۍ,
 Please select Completion Date for Completed Asset Maintenance Log,مهرباني وکړئ د بشپړې شتمنیو د ساتنې لپاره د بشپړې نیټې ټاکنه,
@@ -2980,7 +2977,6 @@
 The name of your company for which you are setting up this system.,د خپل شرکت نوم د کوم لپاره چې تاسو دا سيستم د جوړولو.,
 The number of shares and the share numbers are inconsistent,د ونډې شمېره او د شمېره شمېره متناقض دي,
 The payment gateway account in plan {0} is different from the payment gateway account in this payment request,د پیسو ورکړه د پالن په حساب کې {0} د تادياتو دروازې حساب څخه توپیر دی چې د دې تادیه غوښتنه کې,
-The request for quotation can be accessed by clicking on the following link,د مادیاتو په غوښتنه په کېکاږلو سره په لاندې لینک رسی شي,
 The selected BOMs are not for the same item,د ټاکل شوي BOMs د همدغه توکي نه دي,
 The selected item cannot have Batch,د ټاکل شوي توکي نه شي کولای دسته لري,
 The seller and the buyer cannot be the same,پلورونکي او پیرودونکی ورته نشي,
@@ -3130,7 +3126,6 @@
 Total flexible benefit component amount {0} should not be less than max benefits {1},د انعطاف منونکې ګټې برخې مقدار {0} باید د اعظمي ګټې څخه کم نه وي {1},
 Total hours: {0},Total ساعتونو: {0},
 Total leaves allocated is mandatory for Leave Type {0},د اختصاص شویو پاڼو پاڼو ټول ډولونه د ویلو ډول {0},
-Total weightage assigned should be 100%. It is {0},Total weightage ګمارل باید 100٪ شي. دا د {0},
 Total working hours should not be greater than max working hours {0},Total کار ساعتونو کې باید په پرتله max کار ساعتونو زيات نه وي {0},
 Total {0} ({1}),Total {0} ({1}),
 "Total {0} for all items is zero, may be you should change 'Distribute Charges Based On'",Total {0} لپاره ټول توکي صفر دی، کېدی شي چې تاسو باید بدلون &#39;په تور ویشي پر بنسټ&#39;,
@@ -3544,7 +3539,6 @@
 Company field is required,د شرکت ساحه اړینه ده,
 Creating Dimensions...,ابعاد پیدا کول ...,
 Duplicate entry against the item code {0} and manufacturer {1},د توکي کوډ {0} او جوړونکي {1 against په مقابل کې دوه ځله ننوتل,
-Import Chart Of Accounts from CSV / Excel files,د CSV / اکسیل فایلونو څخه د حسابونو چارټ وارد کړئ,
 Invalid GSTIN! The input you've entered doesn't match the GSTIN format for UIN Holders or Non-Resident OIDAR Service Providers,ناسم GSTIN! هغه ننوتنه چې تاسو یې لیکلې ده د UIN هولډرانو یا غیر اوسیدونکي OIDAR خدمت چمتو کونکو لپاره د GSTIN ب formatه سره مطابقت نلري,
 Invoice Grand Total,انوائس عالي مجموعه,
 Last carbon check date cannot be a future date,د کاربن چیک وروستي نیټه راتلونکي نیټه نشي کیدی,
@@ -3921,7 +3915,6 @@
 Plaid public token error,د عامه نښه نښه,
 Plaid transactions sync error,د پلیډ لیږد سیستم تېروتنه,
 Please check the error log for details about the import errors,مهرباني وکړئ د وارداتو غلطیو په اړه توضیحاتو لپاره د تیروتنې یادښت وګورئ,
-Please click on the following link to set your new password,لطفا د خپل نوي شفر وټاکه په لاندې لینک کلیک,
 Please create <b>DATEV Settings</b> for Company <b>{}</b>.,مهرباني وکړئ د شرکت <b>DATEV امستنې</b> <b>{رامنځته}.</b>,
 Please create adjustment Journal Entry for amount {0} ,مهرباني وکړئ د {0 amount مقدار لپاره د سمون ژورنال ننوتنه جوړه کړئ,
 Please do not create more than 500 items at a time,مهرباني وکړئ په یوځل کې له 500 څخه ډیر توکي مه جوړوئ,
@@ -3997,6 +3990,7 @@
 Release date must be in the future,د خوشې کولو نیټه باید په راتلونکي کې وي,
 Relieving Date must be greater than or equal to Date of Joining,د نیټې نیټه باید د شاملیدو نیټې څخه لوی یا مساوي وي,
 Rename,نوم بدلول,
+Rename Not Allowed,نوم بدلول اجازه نلري,
 Repayment Method is mandatory for term loans,د لنډمهاله پورونو لپاره د تادیې میتود لازمي دی,
 Repayment Start Date is mandatory for term loans,د لنډمهاله پورونو لپاره د تادیې د پیل نیټه لازمي ده,
 Report Item,توکي راپور کړئ,
@@ -4043,7 +4037,6 @@
 Select All,ټول وټاکئ,
 Select Difference Account,د توپیر حساب غوره کړئ,
 Select a Default Priority.,اصلي لومړیتوب غوره کړئ.,
-Select a Supplier from the Default Supplier List of the items below.,د لاندې شیانو د ډیفالټ چمتو کونکي لیست څخه چمتو کونکي غوره کړئ.,
 Select a company,یو شرکت غوره کړئ,
 Select finance book for the item {0} at row {1},د توکي {0 row لپاره په قطار کې {1} لپاره مالي کتاب غوره کړئ,
 Select only one Priority as Default.,د لومړني په توګه یوازې یو لومړیتوب غوره کړئ.,
@@ -4247,7 +4240,6 @@
 Actual ,واقعي,
 Add to cart,کارټ ته یی اضافه کړه,
 Budget,د بودجې د,
-Chart Of Accounts Importer,د حسابونو واردولو چارت,
 Chart of Accounts,د حسابونو چارټ,
 Customer database.,د پیرود ډاټا.,
 Days Since Last order,ورځو راهیسې تېر نظم,
@@ -4546,7 +4538,6 @@
 Check Supplier Invoice Number Uniqueness,چيک عرضه صورتحساب شمېر لوړوالی,
 Make Payment via Journal Entry,ژورنال انفاذ له لارې د پیسو د کمکیانو لپاره,
 Unlink Payment on Cancellation of Invoice,د صورتحساب د فسخ کولو د پیسو Unlink,
-Unlink Advance Payment on Cancelation of Order,د امر لغوه کولو په اړه د اډوانس تادیات غیر لینک,
 Book Asset Depreciation Entry Automatically,کتاب د شتمنیو د استهالک د داخلولو په خپلکارې,
 Automatically Add Taxes and Charges from Item Tax Template,په اتوماتيک ډول د توکو مالیه ټیمپلیټ څخه مالیه او لګښتونه اضافه کړئ,
 Automatically Fetch Payment Terms,د تادیې شرایط په اوتومات ډول راوړل,
@@ -4940,7 +4931,6 @@
 POS Customer Group,POS پيرودونکو ګروپ,
 POS Field,د پوز ډګر,
 POS Item Group,POS د قالب ګروپ,
-[Select],[انتخاب],
 Company Address,شرکت پته,
 Update Stock,تازه دحمل,
 Ignore Pricing Rule,د بیې د حاکمیت له پامه,
@@ -6481,7 +6471,6 @@
 Appraisal Template,ارزونې کينډۍ,
 For Employee Name,د کارګر نوم,
 Goals,موخې,
-Calculate Total Score,ټولې نمرې محاسبه,
 Total Score (Out of 5),ټولې نمرې (د 5 څخه),
 "Any other remarks, noteworthy effort that should go in the records.",کوم بل څرګندونې، د یادولو وړ هڅې چې بايد په اسنادو ته ولاړ شي.,
 Appraisal Goal,د ارزونې موخه,
@@ -6599,11 +6588,6 @@
 Reason for Leaving,د پرېښودو لامل,
 Leave Encashed?,ووځي Encashed؟,
 Encashment Date,د ورکړې نېټه,
-Exit Interview Details,د وتلو سره مرکه په بشپړه توګه کتل,
-Held On,جوړه,
-Reason for Resignation,د استعفا دليل,
-Better Prospects,ته ښه زمينه,
-Health Concerns,روغتیا اندیښنې,
 New Workplace,نوی کارځای,
 HR-EAD-.YYYY.-,HR-EAD-.YYYY.-,
 Returned Amount,بیرته ورکړل شوې اندازه,
@@ -8239,9 +8223,6 @@
 Manufacturers used in Items,جوړونکو په توکي کارول,
 Limited to 12 characters,محدود تر 12 تورو,
 MAT-MR-.YYYY.-,MAT-MR -YYYY-,
-Set Warehouse,ګودام تنظیم کړئ,
-Sets 'For Warehouse' in each row of the Items table.,د توکو جدول هر قطار کې د &#39;ګودام لپاره&#39; ټاکي.,
-Requested For,غوښتنه د,
 Partially Ordered,تر یوې اندازې حکم شوی,
 Transferred,سپارل,
 % Ordered,٪ د سپارښتنې,
@@ -8690,8 +8671,6 @@
 Select warehouse for material requests,د موادو غوښتنو لپاره ګودام غوره کړئ,
 Transfer Materials For Warehouse {0},د ګودام For 0 For لپاره توکي انتقال کړئ,
 Production Plan Material Request Warehouse,د تولید پلان موادو موادو غوښتنه ګودام,
-Set From Warehouse,د ګودام څخه تنظیم کړئ,
-Source Warehouse (Material Transfer),د سرچینې ګودام (د موادو لیږد),
 Sets 'Source Warehouse' in each row of the items table.,د توکو جدول هر قطار کې &#39;سرچینه ګودام&#39; وټاکئ.,
 Sets 'Target Warehouse' in each row of the items table.,د توکو جدول هر قطار کې &#39;هدف ګودام&#39; وټاکئ.,
 Show Cancelled Entries,لغوه شوې ننوتنې ښودل,
@@ -9157,7 +9136,6 @@
 Is Income Tax Component,د عایداتو مالیې برخه ده,
 Component properties and references ,د برخې ملکیتونه او سرچینې,
 Additional Salary ,اضافي معاش,
-Condtion and formula,وضعیت او فورمول,
 Unmarked days,نخښه شوي ورځې,
 Absent Days,غیر حاضر ورځې,
 Conditions and Formula variable and example,شرایط او فورمول متغیر او مثال,
@@ -9444,7 +9422,6 @@
 Please check your Plaid client ID and secret values,مهرباني وکړئ خپل د پلیډ مؤکل ID او پټ ارزښتونه وګورئ,
 Bank transaction creation error,د بانک د لیږد تیروتنه,
 Unit of Measurement,د اندازه کولو واحد,
-Row #{}: Selling rate for item {} is lower than its {}. Selling rate should be atleast {},قطار # {}: د توکي {for لپاره د پلور نرخ د هغې {} څخه ټیټ دی. د پلور نرخ باید لږترلږه {be,
 Fiscal Year {0} Does Not Exist,مالي کال {0} شتون نلري,
 Row # {0}: Returned Item {1} does not exist in {2} {3},قطار # {0}: بیرته راغلی توکی {1} په {2} {3 in کې شتون نلري,
 Valuation type charges can not be marked as Inclusive,د ارزښت ډول چارجونه د ټول شموله په توګه نښه نشي کیدی,
@@ -9598,8 +9575,60 @@
 Response Time for {0} priority in row {1} can't be greater than Resolution Time.,په قطار کې {1} لومړیتوب لپاره د ځواب وخت د حل وخت څخه لوی نشي کیدی.,
 {0} is not enabled in {1},{0} په {1} کې ندی فعال شوی,
 Group by Material Request,ډله د موادو په غوښتنه,
-"Row {0}: For Supplier {0}, Email Address is Required to Send Email",قطار {0}: د چمتو کونکي لپاره {0} ، د بریښنالیک لیږلو لپاره د بریښنالیک آدرس اړین دی,
 Email Sent to Supplier {0},عرضه کونکي ته بریښنالیک ولیږل شو {0},
 "The Access to Request for Quotation From Portal is Disabled. To Allow Access, Enable it in Portal Settings.",له پورټل څخه د غوښتنې غوښتنې ته لاسرسی نافعال شوی دی. د لاسرسي اجازه ورکولو لپاره ، دا په پورټال تنظیماتو کې فعال کړئ.,
 Supplier Quotation {0} Created,د چمتو کونکي نرخ {0} جوړ شو,
 Valid till Date cannot be before Transaction Date,تر نیټې پورې اعتبار نشي کولی د لیږد نیټې څخه مخکې نشي,
+Unlink Advance Payment on Cancellation of Order,د امر لغوه کولو په اړه د اډوانس تادیه غیر لنک کړئ,
+"Simple Python Expression, Example: territory != 'All Territories'",د ساده پیتون بیان ، مثال: سیمه! = &#39;ټولې سیمې&#39;,
+Sales Contributions and Incentives,د پلور شراکتونه او هڅونې,
+Sourced by Supplier,د عرضه کونکي لخوا سرچینه شوې,
+Total weightage assigned should be 100%.<br>It is {0},ټاکل شوی ټول وزن باید 100 be وي.<br> دا {0} دی,
+Account {0} exists in parent company {1}.,اکاونټ {0 parent په اصلي شرکت {1} کې شتون لري.,
+"To overrule this, enable '{0}' in company {1}",د دې په نښه کولو لپاره ، په {1 company شرکت کې &#39;{0}&#39; وړ کړئ,
+Invalid condition expression,د غلط حالت څرګندونه,
+Please Select a Company First,مهرباني وکړئ لومړی یو شرکت غوره کړئ,
+Please Select Both Company and Party Type First,مهرباني وکړئ لومړی د شرکت او ګوند دواړه ډول غوره کړئ,
+Provide the invoice portion in percent,د انوائس برخه په سلنه کې چمتو کړئ,
+Give number of days according to prior selection,د مخکیني انتخاب مطابق د ورځو شمیره ورکړئ,
+Email Details,د بریښنالیک توضیحات,
+"Select a greeting for the receiver. E.g. Mr., Ms., etc.",د ترلاسه کونکي لپاره سلام کول غوره کړئ. د مثال په توګه ښاغلي ، اغلې ، وغيره.,
+Preview Email,د مخکتنې بریښنالیک,
+Please select a Supplier,مهرباني وکړئ یو عرضه کونکی غوره کړئ,
+Supplier Lead Time (days),د چمتو کونکي رهبري وخت (ورځې),
+"Home, Work, etc.",کور ، کار او نور.,
+Exit Interview Held On,د وتلو مرکه ترسره شوه,
+Condition and formula,حالت او فورمول,
+Sets 'Target Warehouse' in each row of the Items table.,د توضیحاتو جدول په هر قطار کې &#39;هدف ګودام&#39; وټاکئ.,
+Sets 'Source Warehouse' in each row of the Items table.,د توکو جدول هر قطار کې &#39;سرچینه ګودام&#39; وټاکئ.,
+POS Register,د پوسټ راجستر,
+"Can not filter based on POS Profile, if grouped by POS Profile",فلټ نشي کولی د POS پروفایل پراساس ، که د POS پروفایل لخوا ګروپ شوی وي,
+"Can not filter based on Customer, if grouped by Customer",فلټ نشي کولی د پیرودونکي پراساس ، که د پیرودونکي لخوا ګروپ شوی وي,
+"Can not filter based on Cashier, if grouped by Cashier",د کاشیر پر اساس فلټر نشي کولی ، که د کاشیر لخوا ډله وی,
+Payment Method,د تادیه کولو طریقه,
+"Can not filter based on Payment Method, if grouped by Payment Method",د تادیې میتود پراساس فلټر نشي کولی ، که د تادیې میتود لخوا ګروپ شوی وي,
+Supplier Quotation Comparison,د چمتو کونکي نرخ پرتله,
+Price per Unit (Stock UOM),د هر واحد قیمت (سټاک UOM),
+Group by Supplier,ډله د چمتو کونکي لخوا,
+Group by Item,ډله د توکي په واسطه,
+Remember to set {field_label}. It is required by {regulation}.,د {Field_label set ټاکلو یاد وساته. دا د {مقرراتو by لخوا اړین دی.,
+Enrollment Date cannot be before the Start Date of the Academic Year {0},د شمولیت نیټه د اکاډمیک کال Date 0} د پیل نیټې څخه مخکې نشي کیدی,
+Enrollment Date cannot be after the End Date of the Academic Term {0},د نوم لیکنې نیټه د اکاډمیکې مودې پای Date 0 after وروسته نشي کیدی,
+Enrollment Date cannot be before the Start Date of the Academic Term {0},د شاملیدو نیټه د اکاډمیک دورې د پیل نیټې څخه مخکې نشي کیدی {0},
+Posting future transactions are not allowed due to Immutable Ledger,د راتلونکی لیږدونو پوسټ کول د غیر عاجل لیجر له امله اجازه نلري,
+Future Posting Not Allowed,راتلونکي پوسټ کولو ته اجازه نشته,
+"To enable Capital Work in Progress Accounting, ",د پرمختګ محاسبې کې د سرمایه کار وړولو لپاره ،,
+you must select Capital Work in Progress Account in accounts table,تاسو باید د حسابونو جدول کې د پرمختګ حساب کې سرمایه کاري انتخاب وټاکئ,
+You can also set default CWIP account in Company {},تاسو کولی شئ په کمپنۍ default in کې CWIP ډیفالټ حساب هم تنظیم کړئ,
+The Request for Quotation can be accessed by clicking on the following button,د نرخ اخیستنې غوښتنه په لاندې ت buttonۍ کلیک کولو سره لاسرسی کیدی شي,
+Regards,درناوی,
+Please click on the following button to set your new password,مهرباني وکړئ په لاندې ت buttonۍ کلیک وکړئ ترڅو خپل نوی رمز تنظیم کړئ,
+Update Password,اوسمهال شوی رمز,
+Row #{}: Selling rate for item {} is lower than its {}. Selling {} should be atleast {},قطار # {}: د توکي {for لپاره د پلور نرخ د هغې {} څخه ټیټ دی. د {lling پلور باید لږترلږه وي {,
+You can alternatively disable selling price validation in {} to bypass this validation.,تاسو کولی شئ په متبادل ډول د دې اعتبار بای پاس کولو لپاره په {in کې د پلور نرخ تایید غیر فعال کړئ.,
+Invalid Selling Price,د پلور ناقانونه بیه,
+Address needs to be linked to a Company. Please add a row for Company in the Links table.,پته اړتیا لري چې له یوه شرکت سره وصل شي. مهرباني وکړئ د لینکونو جدول کې د شرکت لپاره قطار اضافه کړئ.,
+Company Not Linked,شرکت نه تړل شوی,
+Import Chart of Accounts from CSV / Excel files,د CSV / اکسیل فایلونو څخه د حسابونو چارټ وارد کړئ,
+Completed Qty cannot be greater than 'Qty to Manufacture',بشپړ شوی مقدار د &#39;مقدار جوړولو لپاره&#39; څخه لوی کیدی نشي,
+"Row {0}: For Supplier {1}, Email Address is Required to send an email",قطار {0}: د چمتو کونکي {1} لپاره ، د بریښنالیک لیږلو لپاره د بریښنالیک آدرس اړین دی,
diff --git a/erpnext/translations/pt.csv b/erpnext/translations/pt.csv
index 9e78091..00c7f70 100644
--- a/erpnext/translations/pt.csv
+++ b/erpnext/translations/pt.csv
@@ -521,7 +521,6 @@
 Chargeble,Chargeble,
 Charges are updated in Purchase Receipt against each item,Os custos de cada item são atualizados no Recibo de Compra,
 "Charges will be distributed proportionately based on item qty or amount, as per your selection","Os custos serão distribuídos proporcionalmente com base na qtd ou montante, conforme tiver selecionado",
-Chart Of Accounts,Plano de Contas,
 Chart of Cost Centers,Gráfico de Centros de Custo,
 Check all,Verificar tudo,
 Checkout,Check-out,
@@ -581,7 +580,6 @@
 Compensatory Off,Descanso de Compensação,
 Compensatory leave request days not in valid holidays,Dias de solicitação de licença compensatória não em feriados válidos,
 Complaint,Queixa,
-Completed Qty can not be greater than 'Qty to Manufacture',"A Qtd Concluída não pode ser superior à ""Qtd de Fabrico""",
 Completion Date,Data de conclusão,
 Computer,Computador,
 Condition,Condição,
@@ -2033,7 +2031,6 @@
 Please select Charge Type first,"Por favor, selecione primeiro o Tipo de Cobrança",
 Please select Company,"Por favor, selecione a Empresa",
 Please select Company and Designation,Por favor selecione Empresa e Designação,
-Please select Company and Party Type first,"Por favor, selecione primeiro a Empresa e o Tipo de Parte",
 Please select Company and Posting Date to getting entries,"Por favor, selecione Empresa e Data de Lançamento para obter as inscrições",
 Please select Company first,"Por favor, selecione primeiro a Empresa",
 Please select Completion Date for Completed Asset Maintenance Log,Selecione a Data de conclusão do registro de manutenção de ativos concluídos,
@@ -2980,7 +2977,6 @@
 The name of your company for which you are setting up this system.,O nome da empresa para a qual está a configurar este sistema.,
 The number of shares and the share numbers are inconsistent,O número de ações e os números de compartilhamento são inconsistentes,
 The payment gateway account in plan {0} is different from the payment gateway account in this payment request,A conta do gateway de pagamento no plano {0} é diferente da conta do gateway de pagamento nesta solicitação de pagamento,
-The request for quotation can be accessed by clicking on the following link,Pode aceder à solicitação de cotação ao clicar no link a seguir,
 The selected BOMs are not for the same item,As listas de materiais selecionadas não são para o mesmo item,
 The selected item cannot have Batch,O item selecionado não pode ter um Lote,
 The seller and the buyer cannot be the same,O vendedor e o comprador não podem ser os mesmos,
@@ -3130,7 +3126,6 @@
 Total flexible benefit component amount {0} should not be less than max benefits {1},O valor total do componente de benefício flexível {0} não deve ser menor do que os benefícios máximos {1},
 Total hours: {0},Horas totais: {0},
 Total leaves allocated is mandatory for Leave Type {0},O total de folhas alocadas é obrigatório para o tipo de licença {0},
-Total weightage assigned should be 100%. It is {0},O peso total atribuído deve ser de 100 %. É {0},
 Total working hours should not be greater than max working hours {0},O total de horas de trabalho não deve ser maior que o nr. máx. de horas de trabalho {0},
 Total {0} ({1}),Total {0} ({1}),
 "Total {0} for all items is zero, may be you should change 'Distribute Charges Based On'","Total de {0} para todos os itens é zero, pode ser que você deve mudar &#39;Distribuir taxas sobre&#39;",
@@ -3544,7 +3539,6 @@
 Company field is required,Campo da empresa é obrigatório,
 Creating Dimensions...,Criando Dimensões ...,
 Duplicate entry against the item code {0} and manufacturer {1},Entrada duplicada no código do item {0} e no fabricante {1},
-Import Chart Of Accounts from CSV / Excel files,Importar gráfico de contas de arquivos CSV / Excel,
 Invalid GSTIN! The input you've entered doesn't match the GSTIN format for UIN Holders or Non-Resident OIDAR Service Providers,GSTIN inválido! A entrada que você inseriu não corresponde ao formato GSTIN para os titulares de UIN ou para os provedores de serviços OIDAR não residentes,
 Invoice Grand Total,Total geral da fatura,
 Last carbon check date cannot be a future date,A última data de verificação de carbono não pode ser uma data futura,
@@ -3921,7 +3915,6 @@
 Plaid public token error,Erro de token público de xadrez,
 Plaid transactions sync error,Erro de sincronização de transações de xadrez,
 Please check the error log for details about the import errors,"Por favor, verifique o log de erros para detalhes sobre os erros de importação.",
-Please click on the following link to set your new password,"Por favor, clique no link a seguir para definir a sua nova senha",
 Please create <b>DATEV Settings</b> for Company <b>{}</b>.,Crie <b>configurações de DATEV</b> para a empresa <b>{}</b> .,
 Please create adjustment Journal Entry for amount {0} ,Crie um lançamento contábil manual para o valor {0},
 Please do not create more than 500 items at a time,"Por favor, não crie mais de 500 itens de cada vez",
@@ -3997,6 +3990,7 @@
 Release date must be in the future,Data de lançamento deve estar no futuro,
 Relieving Date must be greater than or equal to Date of Joining,A Data de Alívio deve ser maior ou igual à Data de Ingresso,
 Rename,Alterar Nome,
+Rename Not Allowed,Renomear não permitido,
 Repayment Method is mandatory for term loans,O método de reembolso é obrigatório para empréstimos a prazo,
 Repayment Start Date is mandatory for term loans,A data de início do reembolso é obrigatória para empréstimos a prazo,
 Report Item,Item de relatorio,
@@ -4043,7 +4037,6 @@
 Select All,Selecionar tudo,
 Select Difference Account,Selecione uma conta de diferença,
 Select a Default Priority.,Selecione uma prioridade padrão.,
-Select a Supplier from the Default Supplier List of the items below.,Selecione um fornecedor na lista de fornecedores padrão dos itens abaixo.,
 Select a company,Selecione uma empresa,
 Select finance book for the item {0} at row {1},Selecione o livro de finanças para o item {0} na linha {1},
 Select only one Priority as Default.,Selecione apenas uma prioridade como padrão.,
@@ -4247,7 +4240,6 @@
 Actual ,Atual,
 Add to cart,Adicionar ao carrinho,
 Budget,Orçamento,
-Chart Of Accounts Importer,Importador de gráfico de contas,
 Chart of Accounts,Gráfico de contas,
 Customer database.,Banco de dados do cliente.,
 Days Since Last order,Dias Desde a última Ordem,
@@ -4546,7 +4538,6 @@
 Check Supplier Invoice Number Uniqueness,Verificar Singularidade de Número de Fatura de Fornecedor,
 Make Payment via Journal Entry,Fazer o pagamento através do Lançamento Contabilístico,
 Unlink Payment on Cancellation of Invoice,Desvincular Pagamento no Cancelamento da Fatura,
-Unlink Advance Payment on Cancelation of Order,Desvincular o pagamento antecipado ao cancelar o pedido,
 Book Asset Depreciation Entry Automatically,Entrada de Depreciação de Ativos do Livro Automaticamente,
 Automatically Add Taxes and Charges from Item Tax Template,Adicionar automaticamente impostos e encargos do modelo de imposto do item,
 Automatically Fetch Payment Terms,Buscar automaticamente condições de pagamento,
@@ -4940,7 +4931,6 @@
 POS Customer Group,Grupo de Cliente POS,
 POS Field,Campo POS,
 POS Item Group,Grupo de Itens POS,
-[Select],[Selecionar],
 Company Address,Endereço da companhia,
 Update Stock,Actualizar Stock,
 Ignore Pricing Rule,Ignorar Regra de Fixação de Preços,
@@ -6481,7 +6471,6 @@
 Appraisal Template,Modelo de Avaliação,
 For Employee Name,Para o Nome do Funcionário,
 Goals,Objetivos,
-Calculate Total Score,Calcular a Classificação Total,
 Total Score (Out of 5),Classificação Total (em 5),
 "Any other remarks, noteworthy effort that should go in the records.","Quaisquer outras observações, dignas de serem mencionadas, que devem ir para os registos.",
 Appraisal Goal,Objetivo da Avaliação,
@@ -6599,11 +6588,6 @@
 Reason for Leaving,Motivo de Saída,
 Leave Encashed?,Sair de Pagos?,
 Encashment Date,Data de Pagamento,
-Exit Interview Details,Sair de Dados da Entrevista,
-Held On,Realizado Em,
-Reason for Resignation,Motivo de Demissão,
-Better Prospects,Melhores Perspetivas,
-Health Concerns,Problemas Médicos,
 New Workplace,Novo Local de Trabalho,
 HR-EAD-.YYYY.-,HR-EAD-.YYYY.-,
 Returned Amount,Valor devolvido,
@@ -8239,9 +8223,6 @@
 Manufacturers used in Items,Fabricantes utilizados nos Itens,
 Limited to 12 characters,Limitado a 12 caracteres,
 MAT-MR-.YYYY.-,MAT-MR-.YYYY.-,
-Set Warehouse,Definir Armazém,
-Sets 'For Warehouse' in each row of the Items table.,Define &#39;For Warehouse&#39; em cada linha da tabela de itens.,
-Requested For,Solicitado Para,
 Partially Ordered,Parcialmente ordenado,
 Transferred,Transferido,
 % Ordered,% Pedida,
@@ -8690,8 +8671,6 @@
 Select warehouse for material requests,Selecione o armazém para pedidos de material,
 Transfer Materials For Warehouse {0},Transferir materiais para armazém {0},
 Production Plan Material Request Warehouse,Armazém de solicitação de material do plano de produção,
-Set From Warehouse,Conjunto do armazém,
-Source Warehouse (Material Transfer),Armazém de origem (transferência de material),
 Sets 'Source Warehouse' in each row of the items table.,Define &#39;Source Warehouse&#39; em cada linha da tabela de itens.,
 Sets 'Target Warehouse' in each row of the items table.,Define &#39;Armazém de destino&#39; em cada linha da tabela de itens.,
 Show Cancelled Entries,Mostrar entradas canceladas,
@@ -9157,7 +9136,6 @@
 Is Income Tax Component,É componente de imposto de renda,
 Component properties and references ,Propriedades e referências do componente,
 Additional Salary ,Salário Adicional,
-Condtion and formula,Condição e fórmula,
 Unmarked days,Dias não marcados,
 Absent Days,Dias ausentes,
 Conditions and Formula variable and example,Condições e variável de fórmula e exemplo,
@@ -9444,7 +9422,6 @@
 Please check your Plaid client ID and secret values,Verifique o seu ID de cliente Plaid e os valores secretos,
 Bank transaction creation error,Erro de criação de transação bancária,
 Unit of Measurement,Unidade de medida,
-Row #{}: Selling rate for item {} is lower than its {}. Selling rate should be atleast {},Linha nº {}: A taxa de venda do item {} é menor do que {}. A taxa de venda deve ser pelo menos {},
 Fiscal Year {0} Does Not Exist,Ano Fiscal {0} Não Existe,
 Row # {0}: Returned Item {1} does not exist in {2} {3},Linha # {0}: o item devolvido {1} não existe em {2} {3},
 Valuation type charges can not be marked as Inclusive,Encargos de tipo de avaliação não podem ser marcados como inclusivos,
@@ -9598,8 +9575,60 @@
 Response Time for {0} priority in row {1} can't be greater than Resolution Time.,O tempo de resposta para {0} prioridade na linha {1} não pode ser maior que o tempo de resolução.,
 {0} is not enabled in {1},{0} não está habilitado em {1},
 Group by Material Request,Agrupar por solicitação de material,
-"Row {0}: For Supplier {0}, Email Address is Required to Send Email","Linha {0}: Para o fornecedor {0}, o endereço de e-mail é obrigatório para enviar o e-mail",
 Email Sent to Supplier {0},Email enviado ao fornecedor {0},
 "The Access to Request for Quotation From Portal is Disabled. To Allow Access, Enable it in Portal Settings.","O acesso à solicitação de cotação do portal está desabilitado. Para permitir o acesso, habilite-o nas configurações do portal.",
 Supplier Quotation {0} Created,Cotação do fornecedor {0} criada,
 Valid till Date cannot be before Transaction Date,Válido até a data não pode ser anterior à data da transação,
+Unlink Advance Payment on Cancellation of Order,Desvincular o pagamento adiantado no cancelamento do pedido,
+"Simple Python Expression, Example: territory != 'All Territories'","Expressão Python simples, exemplo: território! = &#39;Todos os territórios&#39;",
+Sales Contributions and Incentives,Contribuições de vendas e incentivos,
+Sourced by Supplier,Fornecido pelo Fornecedor,
+Total weightage assigned should be 100%.<br>It is {0},O peso total atribuído deve ser 100%.<br> É {0},
+Account {0} exists in parent company {1}.,A conta {0} existe na empresa-mãe {1}.,
+"To overrule this, enable '{0}' in company {1}","Para anular isso, ative &#39;{0}&#39; na empresa {1}",
+Invalid condition expression,Expressão de condição inválida,
+Please Select a Company First,Selecione uma empresa primeiro,
+Please Select Both Company and Party Type First,Selecione o tipo de empresa e parte primeiro,
+Provide the invoice portion in percent,Fornece a parte da fatura em porcentagem,
+Give number of days according to prior selection,Dê o número de dias de acordo com a seleção anterior,
+Email Details,Detalhes de email,
+"Select a greeting for the receiver. E.g. Mr., Ms., etc.","Selecione uma saudação para o destinatário. Por exemplo, Sr., Sra., Etc.",
+Preview Email,Pré-visualizar email,
+Please select a Supplier,Selecione um fornecedor,
+Supplier Lead Time (days),Prazo de entrega do fornecedor (dias),
+"Home, Work, etc.","Casa, Trabalho, etc.",
+Exit Interview Held On,Entrevista de saída realizada em,
+Condition and formula,Condição e fórmula,
+Sets 'Target Warehouse' in each row of the Items table.,Define &#39;Armazém de destino&#39; em cada linha da tabela de itens.,
+Sets 'Source Warehouse' in each row of the Items table.,Define &#39;Source Warehouse&#39; em cada linha da tabela de itens.,
+POS Register,Registro de PDV,
+"Can not filter based on POS Profile, if grouped by POS Profile","Não é possível filtrar com base no Perfil de POS, se agrupado por Perfil de POS",
+"Can not filter based on Customer, if grouped by Customer","Não é possível filtrar com base no cliente, se agrupado por cliente",
+"Can not filter based on Cashier, if grouped by Cashier","Não é possível filtrar com base no Caixa, se agrupado por Caixa",
+Payment Method,Forma de pagamento,
+"Can not filter based on Payment Method, if grouped by Payment Method","Não é possível filtrar com base na forma de pagamento, se agrupado por forma de pagamento",
+Supplier Quotation Comparison,Comparação de cotação de fornecedor,
+Price per Unit (Stock UOM),Preço por unidade (UOM de estoque),
+Group by Supplier,Grupo por Fornecedor,
+Group by Item,Agrupar por Item,
+Remember to set {field_label}. It is required by {regulation}.,Lembre-se de definir {field_label}. É exigido por {regulamento}.,
+Enrollment Date cannot be before the Start Date of the Academic Year {0},A data de inscrição não pode ser anterior à data de início do ano letivo {0},
+Enrollment Date cannot be after the End Date of the Academic Term {0},A data de inscrição não pode ser posterior à data de término do período acadêmico {0},
+Enrollment Date cannot be before the Start Date of the Academic Term {0},A data de inscrição não pode ser anterior à data de início do período acadêmico {0},
+Posting future transactions are not allowed due to Immutable Ledger,Lançamento de transações futuras não é permitido devido ao Immutable Ledger,
+Future Posting Not Allowed,Postagem futura não permitida,
+"To enable Capital Work in Progress Accounting, ","Para habilitar a Contabilidade de Trabalho Capital em Andamento,",
+you must select Capital Work in Progress Account in accounts table,você deve selecionar a conta Capital Work in Progress na tabela de contas,
+You can also set default CWIP account in Company {},Você também pode definir uma conta CWIP padrão na Empresa {},
+The Request for Quotation can be accessed by clicking on the following button,O Pedido de Cotação pode ser acessado clicando no seguinte botão,
+Regards,Saudações,
+Please click on the following button to set your new password,Clique no botão a seguir para definir sua nova senha,
+Update Password,Atualizar senha,
+Row #{}: Selling rate for item {} is lower than its {}. Selling {} should be atleast {},Linha nº {}: A taxa de venda do item {} é menor do que {}. A venda {} deve ser pelo menos {},
+You can alternatively disable selling price validation in {} to bypass this validation.,"Como alternativa, você pode desativar a validação do preço de venda em {} para ignorar esta validação.",
+Invalid Selling Price,Preço de Venda Inválido,
+Address needs to be linked to a Company. Please add a row for Company in the Links table.,O endereço precisa estar vinculado a uma empresa. Adicione uma linha para Empresa na tabela de Links.,
+Company Not Linked,Empresa não vinculada,
+Import Chart of Accounts from CSV / Excel files,Importar plano de contas de arquivos CSV / Excel,
+Completed Qty cannot be greater than 'Qty to Manufacture',Qtd concluída não pode ser maior que &#39;Qty to Manufacture&#39;,
+"Row {0}: For Supplier {1}, Email Address is Required to send an email","Linha {0}: Para o fornecedor {1}, o endereço de e-mail é obrigatório para enviar um e-mail",
diff --git a/erpnext/translations/pt_br.csv b/erpnext/translations/pt_br.csv
index 3054ec2..38378c4 100644
--- a/erpnext/translations/pt_br.csv
+++ b/erpnext/translations/pt_br.csv
@@ -263,7 +263,6 @@
 Company Abbreviation,Sigla da Empresa,
 Company Name cannot be Company,Nome da empresa não pode ser empresa,
 Compensatory Off,Saída Compensatória,
-Completed Qty can not be greater than 'Qty to Manufacture',"Qtde concluída não pode ser maior do que ""Qtde de Fabricação""",
 Confirmed orders from Customers.,Pedidos confirmados de clientes.,
 Consumed Amount,Quantidade Consumida,
 Consumed Qty,Qtde Consumida,
@@ -880,7 +879,6 @@
 Please select Category first,Por favor selecione a Categoria primeiro,
 Please select Charge Type first,Por favor selecione o Tipo de Encargo primeiro,
 Please select Company,"Por favor, selecione Empresa",
-Please select Company and Party Type first,"Por favor, selecione a Empresa e Tipo de Parceiro primeiro",
 Please select Company first,"Por favor, selecione Empresa primeiro",
 Please select Employee,Selecione Colaborador,
 Please select Existing Company for creating Chart of Accounts,"Por favor, selecione empresa já existente para a criação de Plano de Contas",
@@ -1365,7 +1363,6 @@
 Total allocated percentage for sales team should be 100,Porcentagem total alocado para a equipe de vendas deve ser de 100,
 Total cannot be zero,Total não pode ser zero,
 Total hours: {0},Total de horas: {0},
-Total weightage assigned should be 100%. It is {0},Peso total atribuído deve ser de 100%. É {0},
 Total(Amt),Total (Quantia),
 Total(Qty),Total (Qtde),
 Training,Treinamento,
@@ -2133,7 +2130,6 @@
 Job Applicant,Candidato à Vaga,
 For Employee Name,Para Nome do Colaborador,
 Goals,Metas,
-Calculate Total Score,Calcular a Pontuação Total,
 Total Score (Out of 5),Pontuação Total (nota máxima 5),
 "Any other remarks, noteworthy effort that should go in the records.","Quaisquer outras observações, esforço digno de nota que deve constar nos registros.",
 Appraisal Goal,Meta de Avaliação,
@@ -2186,11 +2182,6 @@
 Reason for Leaving,Motivo da saída,
 Leave Encashed?,Licenças Cobradas?,
 Encashment Date,Data da cobrança,
-Exit Interview Details,Detalhes da Entrevista de Saída,
-Held On,Realizada em,
-Reason for Resignation,Motivo para Demissão,
-Better Prospects,Melhores clientes prospectados,
-Health Concerns,Preocupações com a Saúde,
 Advance Account,Conta de Adiantamentos,
 Employee Attendance Tool,Ferramenta para Lançamento de Ponto,
 Unmarked Attendance,Presença Desmarcada,
@@ -2844,7 +2835,6 @@
 Landed Cost Help,Custo de Desembarque Ajuda,
 Manufacturers used in Items,Fabricantes utilizados em Itens,
 Limited to 12 characters,Limitados a 12 caracteres,
-Requested For,Solicitado para,
 % Ordered,% Comprado,
 Terms and Conditions Content,Conteúdo dos Termos e Condições,
 Lead Time Date,Prazo de Entrega,
diff --git a/erpnext/translations/ro.csv b/erpnext/translations/ro.csv
index 21045a1..2f2d9d5 100644
--- a/erpnext/translations/ro.csv
+++ b/erpnext/translations/ro.csv
@@ -521,7 +521,6 @@
 Chargeble,Chargeble,
 Charges are updated in Purchase Receipt against each item,Tarifele sunt actualizate în Primirea cumparare pentru fiecare articol,
 "Charges will be distributed proportionately based on item qty or amount, as per your selection","Taxele vor fi distribuite proporțional în funcție de produs Cantitate sau valoarea, ca pe dvs. de selecție",
-Chart Of Accounts,Diagramă Conturi,
 Chart of Cost Centers,Diagramă Centre de Cost,
 Check all,Selectați toate,
 Checkout,Verifică,
@@ -581,7 +580,6 @@
 Compensatory Off,Fara Masuri Compensatorii,
 Compensatory leave request days not in valid holidays,Plățile compensatorii pleacă în zilele de sărbători valabile,
 Complaint,Reclamație,
-Completed Qty can not be greater than 'Qty to Manufacture',"Finalizat Cantitate nu poate fi mai mare decât ""Cantitate de Fabricare""",
 Completion Date,Data Finalizare,
 Computer,Computer,
 Condition,Condiție,
@@ -2033,7 +2031,6 @@
 Please select Charge Type first,Vă rugăm să selectați tipul de taxă în primul rând,
 Please select Company,Vă rugăm să selectați Company,
 Please select Company and Designation,Selectați Companie și desemnare,
-Please select Company and Party Type first,Vă rugăm să selectați Company și Partidul Tip primul,
 Please select Company and Posting Date to getting entries,Selectați Company and Dateing date pentru a obține înregistrări,
 Please select Company first,Vă rugăm să selectați Company primul,
 Please select Completion Date for Completed Asset Maintenance Log,Selectați Data de încheiere pentru jurnalul de întreținere a activelor finalizat,
@@ -2980,7 +2977,6 @@
 The name of your company for which you are setting up this system.,Numele companiei dumneavoastră pentru care vă sunt configurarea acestui sistem.,
 The number of shares and the share numbers are inconsistent,Numărul de acțiuni și numerele de acțiuni sunt incoerente,
 The payment gateway account in plan {0} is different from the payment gateway account in this payment request,Contul gateway-ului de plată din plan {0} este diferit de contul gateway-ului de plată din această solicitare de plată,
-The request for quotation can be accessed by clicking on the following link,Cererea de ofertă poate fi accesată făcând clic pe link-ul de mai jos,
 The selected BOMs are not for the same item,Cele BOM selectate nu sunt pentru același articol,
 The selected item cannot have Batch,Elementul selectat nu poate avea lot,
 The seller and the buyer cannot be the same,Vânzătorul și cumpărătorul nu pot fi aceleași,
@@ -3130,7 +3126,6 @@
 Total flexible benefit component amount {0} should not be less than max benefits {1},Suma totală a componentelor de beneficii flexibile {0} nu trebuie să fie mai mică decât beneficiile maxime {1},
 Total hours: {0},Numărul total de ore: {0},
 Total leaves allocated is mandatory for Leave Type {0},Numărul total de frunze alocate este obligatoriu pentru Type Leave {0},
-Total weightage assigned should be 100%. It is {0},Weightage total alocat este de 100%. Este {0},
 Total working hours should not be greater than max working hours {0},Numărul total de ore de lucru nu trebuie sa fie mai mare de ore de lucru max {0},
 Total {0} ({1}),Total {0} ({1}),
 "Total {0} for all items is zero, may be you should change 'Distribute Charges Based On'","Total {0} pentru toate articolele este zero, poate fi ar trebui să schimbați „Distribuirea cheltuielilor pe baza“",
@@ -3544,7 +3539,6 @@
 Company field is required,Câmpul companiei este obligatoriu,
 Creating Dimensions...,Crearea dimensiunilor ...,
 Duplicate entry against the item code {0} and manufacturer {1},Duplică intrarea în codul articolului {0} și producătorul {1},
-Import Chart Of Accounts from CSV / Excel files,Importați graficul conturilor din fișiere CSV / Excel,
 Invalid GSTIN! The input you've entered doesn't match the GSTIN format for UIN Holders or Non-Resident OIDAR Service Providers,GSTIN nevalid! Intrarea introdusă nu se potrivește cu formatul GSTIN pentru deținătorii de UIN sau furnizorii de servicii OIDAR nerezidenți,
 Invoice Grand Total,Total factură mare,
 Last carbon check date cannot be a future date,Ultima dată de verificare a carbonului nu poate fi o dată viitoare,
@@ -3921,7 +3915,6 @@
 Plaid public token error,Eroare a simbolului public cu plaid,
 Plaid transactions sync error,Eroare de sincronizare a tranzacțiilor plasate,
 Please check the error log for details about the import errors,Verificați jurnalul de erori pentru detalii despre erorile de import,
-Please click on the following link to set your new password,Vă rugăm să faceți clic pe link-ul următor pentru a seta noua parola,
 Please create <b>DATEV Settings</b> for Company <b>{}</b>.,Vă rugăm să creați <b>DATEV Setări</b> pentru companie <b>{}</b> .,
 Please create adjustment Journal Entry for amount {0} ,Vă rugăm să creați ajustarea Intrare în jurnal pentru suma {0},
 Please do not create more than 500 items at a time,Vă rugăm să nu creați mai mult de 500 de articole simultan,
@@ -3997,6 +3990,7 @@
 Release date must be in the future,Data lansării trebuie să fie în viitor,
 Relieving Date must be greater than or equal to Date of Joining,Data scutirii trebuie să fie mai mare sau egală cu data aderării,
 Rename,Redenumire,
+Rename Not Allowed,Redenumirea nu este permisă,
 Repayment Method is mandatory for term loans,Metoda de rambursare este obligatorie pentru împrumuturile la termen,
 Repayment Start Date is mandatory for term loans,Data de începere a rambursării este obligatorie pentru împrumuturile la termen,
 Report Item,Raport articol,
@@ -4043,7 +4037,6 @@
 Select All,Selectează toate,
 Select Difference Account,Selectați Cont de diferență,
 Select a Default Priority.,Selectați o prioritate implicită.,
-Select a Supplier from the Default Supplier List of the items below.,Selectați un furnizor din lista de furnizori implicită a articolelor de mai jos.,
 Select a company,Selectați o companie,
 Select finance book for the item {0} at row {1},Selectați cartea de finanțe pentru articolul {0} din rândul {1},
 Select only one Priority as Default.,Selectați doar o prioritate ca implicită.,
@@ -4247,7 +4240,6 @@
 Actual ,Efectiv,
 Add to cart,Adăugaţi în Coş,
 Budget,Buget,
-Chart Of Accounts Importer,Graficul importatorului de conturi,
 Chart of Accounts,Grafic de conturi,
 Customer database.,Baza de date pentru clienți.,
 Days Since Last order,Zile de la ultima comandă,
@@ -4546,7 +4538,6 @@
 Check Supplier Invoice Number Uniqueness,Cec Furnizor Numărul facturii Unicitatea,
 Make Payment via Journal Entry,Efectuați o plată prin Jurnalul de intrare,
 Unlink Payment on Cancellation of Invoice,Plata unlink privind anularea facturii,
-Unlink Advance Payment on Cancelation of Order,Deconectați plata în avans la anularea comenzii,
 Book Asset Depreciation Entry Automatically,Încărcarea automată a amortizării activelor din cont,
 Automatically Add Taxes and Charges from Item Tax Template,Adaugă automat impozite și taxe din șablonul de impozit pe articole,
 Automatically Fetch Payment Terms,Obțineți automat Termenii de plată,
@@ -4940,7 +4931,6 @@
 POS Customer Group,Grup Clienți POS,
 POS Field,Câmpul POS,
 POS Item Group,POS Articol Grupa,
-[Select],[Selectati],
 Company Address,Adresă Companie,
 Update Stock,Actualizare stock,
 Ignore Pricing Rule,Ignora Regula Preturi,
@@ -6481,7 +6471,6 @@
 Appraisal Template,Model expertiză,
 For Employee Name,Pentru Numele Angajatului,
 Goals,Obiective,
-Calculate Total Score,Calculaţi scor total,
 Total Score (Out of 5),Scor total (din 5),
 "Any other remarks, noteworthy effort that should go in the records.","Orice alte observații, efort remarcabil care ar trebui înregistrate.",
 Appraisal Goal,Obiectiv expertiză,
@@ -6599,11 +6588,6 @@
 Reason for Leaving,Motiv pentru plecare,
 Leave Encashed?,Concediu Incasat ?,
 Encashment Date,Data plata in Numerar,
-Exit Interview Details,Detalii Interviu de Iesire,
-Held On,Organizat In,
-Reason for Resignation,Motiv pentru demisie,
-Better Prospects,Perspective îmbunătăţite,
-Health Concerns,Probleme de Sanatate,
 New Workplace,Nou loc de muncă,
 HR-EAD-.YYYY.-,HR-EAD-.YYYY.-,
 Returned Amount,Suma restituită,
@@ -8239,9 +8223,6 @@
 Manufacturers used in Items,Producători utilizați în Articole,
 Limited to 12 characters,Limitată la 12 de caractere,
 MAT-MR-.YYYY.-,MAT-MR-.YYYY.-,
-Set Warehouse,Set Warehouse,
-Sets 'For Warehouse' in each row of the Items table.,Setează „Pentru depozit” în fiecare rând al tabelului Elemente.,
-Requested For,Solicitat/ă pentru,
 Partially Ordered,Parțial comandat,
 Transferred,transferat,
 % Ordered,% Comandat,
@@ -8690,8 +8671,6 @@
 Select warehouse for material requests,Selectați depozitul pentru solicitări de materiale,
 Transfer Materials For Warehouse {0},Transfer de materiale pentru depozit {0},
 Production Plan Material Request Warehouse,Plan de producție Cerere de materiale Depozit,
-Set From Warehouse,Set From Warehouse,
-Source Warehouse (Material Transfer),Depozit sursă (transfer material),
 Sets 'Source Warehouse' in each row of the items table.,Setează „Depozit sursă” în fiecare rând al tabelului cu articole.,
 Sets 'Target Warehouse' in each row of the items table.,Setează „Depozit țintă” în fiecare rând al tabelului cu articole.,
 Show Cancelled Entries,Afișați intrările anulate,
@@ -9157,7 +9136,6 @@
 Is Income Tax Component,Este componenta impozitului pe venit,
 Component properties and references ,Proprietăți și referințe ale componentelor,
 Additional Salary ,Salariu suplimentar,
-Condtion and formula,Condiție și formulă,
 Unmarked days,Zile nemarcate,
 Absent Days,Zile absente,
 Conditions and Formula variable and example,Condiții și variabilă Formula și exemplu,
@@ -9444,7 +9422,6 @@
 Please check your Plaid client ID and secret values,Vă rugăm să verificați ID-ul dvs. de client Plaid și valorile secrete,
 Bank transaction creation error,Eroare la crearea tranzacțiilor bancare,
 Unit of Measurement,Unitate de măsură,
-Row #{}: Selling rate for item {} is lower than its {}. Selling rate should be atleast {},Rândul # {}: rata de vânzare a articolului {} este mai mică decât {}. Rata de vânzare ar trebui să fie cel puțin {},
 Fiscal Year {0} Does Not Exist,Anul fiscal {0} nu există,
 Row # {0}: Returned Item {1} does not exist in {2} {3},Rândul # {0}: articolul returnat {1} nu există în {2} {3},
 Valuation type charges can not be marked as Inclusive,Taxele de tip de evaluare nu pot fi marcate ca Incluse,
@@ -9598,8 +9575,60 @@
 Response Time for {0} priority in row {1} can't be greater than Resolution Time.,Timpul de răspuns pentru {0} prioritatea în rândul {1} nu poate fi mai mare decât timpul de rezoluție.,
 {0} is not enabled in {1},{0} nu este activat în {1},
 Group by Material Request,Grupați după cerere de material,
-"Row {0}: For Supplier {0}, Email Address is Required to Send Email","Rândul {0}: pentru furnizor {0}, adresa de e-mail este necesară pentru a trimite e-mail",
 Email Sent to Supplier {0},E-mail trimis către furnizor {0},
 "The Access to Request for Quotation From Portal is Disabled. To Allow Access, Enable it in Portal Settings.","Accesul la cererea de ofertă de la portal este dezactivat. Pentru a permite accesul, activați-l în Setări portal.",
 Supplier Quotation {0} Created,Ofertă furnizor {0} creată,
 Valid till Date cannot be before Transaction Date,Valabil până la data nu poate fi înainte de data tranzacției,
+Unlink Advance Payment on Cancellation of Order,Deconectați plata în avans la anularea comenzii,
+"Simple Python Expression, Example: territory != 'All Territories'","Expresie simplă Python, Exemplu: teritoriu! = „Toate teritoriile”",
+Sales Contributions and Incentives,Contribuții la vânzări și stimulente,
+Sourced by Supplier,Aprovizionat de furnizor,
+Total weightage assigned should be 100%.<br>It is {0},Ponderea totală alocată ar trebui să fie de 100%.<br> Este {0},
+Account {0} exists in parent company {1}.,Contul {0} există în compania mamă {1}.,
+"To overrule this, enable '{0}' in company {1}","Pentru a ignora acest lucru, activați „{0}” în companie {1}",
+Invalid condition expression,Expresie de condiție nevalidă,
+Please Select a Company First,Vă rugăm să selectați mai întâi o companie,
+Please Select Both Company and Party Type First,"Vă rugăm să selectați mai întâi atât compania, cât și tipul de petrecere",
+Provide the invoice portion in percent,Furnizați partea de facturare în procente,
+Give number of days according to prior selection,Dați numărul de zile în funcție de selecția anterioară,
+Email Details,Detalii e-mail,
+"Select a greeting for the receiver. E.g. Mr., Ms., etc.","Selectați o felicitare pentru receptor. De exemplu, domnul, doamna etc.",
+Preview Email,Previzualizați e-mailul,
+Please select a Supplier,Vă rugăm să selectați un furnizor,
+Supplier Lead Time (days),Timp de livrare a furnizorului (zile),
+"Home, Work, etc.","Acasă, serviciu etc.",
+Exit Interview Held On,Ieșiți din interviu,
+Condition and formula,Stare și formulă,
+Sets 'Target Warehouse' in each row of the Items table.,Setează „Depozit țintă” în fiecare rând al tabelului Elemente.,
+Sets 'Source Warehouse' in each row of the Items table.,Setează „Depozit sursă” în fiecare rând al tabelului Elemente.,
+POS Register,Registrul POS,
+"Can not filter based on POS Profile, if grouped by POS Profile","Nu se poate filtra pe baza profilului POS, dacă este grupat după profilul POS",
+"Can not filter based on Customer, if grouped by Customer","Nu se poate filtra pe baza clientului, dacă este grupat după client",
+"Can not filter based on Cashier, if grouped by Cashier","Nu se poate filtra în funcție de Casier, dacă este grupat după Casier",
+Payment Method,Modalitate de plată,
+"Can not filter based on Payment Method, if grouped by Payment Method","Nu se poate filtra pe baza metodei de plată, dacă este grupată după metoda de plată",
+Supplier Quotation Comparison,Compararea ofertelor de ofertă,
+Price per Unit (Stock UOM),Preț per unitate (stoc UOM),
+Group by Supplier,Grup pe furnizor,
+Group by Item,Grupați după articol,
+Remember to set {field_label}. It is required by {regulation}.,Nu uitați să setați {field_label}. Este cerut de {regulament}.,
+Enrollment Date cannot be before the Start Date of the Academic Year {0},Data înscrierii nu poate fi înainte de data de începere a anului academic {0},
+Enrollment Date cannot be after the End Date of the Academic Term {0},Data înscrierii nu poate fi ulterioară datei de încheiere a termenului academic {0},
+Enrollment Date cannot be before the Start Date of the Academic Term {0},Data înscrierii nu poate fi anterioară datei de începere a termenului academic {0},
+Posting future transactions are not allowed due to Immutable Ledger,Înregistrarea tranzacțiilor viitoare nu este permisă din cauza contabilității imuabile,
+Future Posting Not Allowed,Postarea viitoare nu este permisă,
+"To enable Capital Work in Progress Accounting, ","Pentru a permite contabilitatea activității de capital în curs,",
+you must select Capital Work in Progress Account in accounts table,trebuie să selectați Contul de capital în curs în tabelul de conturi,
+You can also set default CWIP account in Company {},"De asemenea, puteți seta contul CWIP implicit în Companie {}",
+The Request for Quotation can be accessed by clicking on the following button,Cererea de ofertă poate fi accesată făcând clic pe butonul următor,
+Regards,Salutari,
+Please click on the following button to set your new password,Vă rugăm să faceți clic pe următorul buton pentru a seta noua parolă,
+Update Password,Actualizați parola,
+Row #{}: Selling rate for item {} is lower than its {}. Selling {} should be atleast {},Rândul # {}: rata de vânzare a articolului {} este mai mică decât {}. Vânzarea {} ar trebui să fie cel puțin {},
+You can alternatively disable selling price validation in {} to bypass this validation.,Puteți dezactiva alternativ validarea prețului de vânzare în {} pentru a ocoli această validare.,
+Invalid Selling Price,Preț de vânzare nevalid,
+Address needs to be linked to a Company. Please add a row for Company in the Links table.,Adresa trebuie să fie legată de o companie. Vă rugăm să adăugați un rând pentru Companie în tabelul Legături.,
+Company Not Linked,Compania nu este legată,
+Import Chart of Accounts from CSV / Excel files,Importați planul de conturi din fișiere CSV / Excel,
+Completed Qty cannot be greater than 'Qty to Manufacture',Cantitatea completată nu poate fi mai mare decât „Cantitatea pentru fabricare”,
+"Row {0}: For Supplier {1}, Email Address is Required to send an email","Rândul {0}: pentru furnizor {1}, este necesară adresa de e-mail pentru a trimite un e-mail",
diff --git a/erpnext/translations/ru.csv b/erpnext/translations/ru.csv
index f007ec4..5feb3e6 100644
--- a/erpnext/translations/ru.csv
+++ b/erpnext/translations/ru.csv
@@ -521,7 +521,6 @@
 Chargeble,Chargeble,
 Charges are updated in Purchase Receipt against each item,Расходы обновляются в приобретении получение против каждого пункта,
 "Charges will be distributed proportionately based on item qty or amount, as per your selection","Расходы будут распределяться пропорционально на основе количества или суммы продукта, согласно вашему выбору",
-Chart Of Accounts,План счетов,
 Chart of Cost Centers,План МВЗ,
 Check all,Отметить все,
 Checkout,"Проверять, выписываться",
@@ -581,7 +580,6 @@
 Compensatory Off,Компенсационные Выкл,
 Compensatory leave request days not in valid holidays,Дни запроса на получение компенсационных отчислений не действительны,
 Complaint,жалоба,
-Completed Qty can not be greater than 'Qty to Manufacture',"Завершен Кол-во не может быть больше, чем ""Кол-во для изготовления""",
 Completion Date,Дата завершения,
 Computer,компьютер,
 Condition,Условия,
@@ -2033,7 +2031,6 @@
 Please select Charge Type first,"Пожалуйста, выберите Charge Тип первый",
 Please select Company,"Пожалуйста, выберите компанию",
 Please select Company and Designation,Выберите компанию и обозначение,
-Please select Company and Party Type first,"Пожалуйста, выберите компании и партийных первого типа",
 Please select Company and Posting Date to getting entries,Выберите компанию и дату проводки для получения записей.,
 Please select Company first,"Пожалуйста, выберите КОМПАНИЯ Первый",
 Please select Completion Date for Completed Asset Maintenance Log,Выберите Дата завершения для завершенного журнала обслуживания активов,
@@ -2980,7 +2977,6 @@
 The name of your company for which you are setting up this system.,"Название вашей компании, для которой вы настраиваете эту систему.",
 The number of shares and the share numbers are inconsistent,Количество акций и номеров акций несовместимы,
 The payment gateway account in plan {0} is different from the payment gateway account in this payment request,Учетная запись платежного шлюза в плане {0} отличается от учетной записи платежного шлюза в этом платежном запросе,
-The request for quotation can be accessed by clicking on the following link,Запрос на предложение доступен по следующей ссылке,
 The selected BOMs are not for the same item,Выбранные ВМ не для одного продукта,
 The selected item cannot have Batch,Выбранный продукт не может иметь партию,
 The seller and the buyer cannot be the same,Продавец и покупатель не могут быть одинаковыми,
@@ -3130,7 +3126,6 @@
 Total flexible benefit component amount {0} should not be less than max benefits {1},Общая сумма гибкого компонента вознаграждения {0} не должна быть меньше максимальной выгоды {1},
 Total hours: {0},Общее количество часов: {0},
 Total leaves allocated is mandatory for Leave Type {0},Общее количество выделенных листов является обязательным для типа отпуска {0},
-Total weightage assigned should be 100%. It is {0},Всего Weightage назначен должна быть 100%. Это {0},
 Total working hours should not be greater than max working hours {0},"Всего продолжительность рабочего времени не должна быть больше, чем максимальное рабочее время {0}",
 Total {0} ({1}),Общая {0} ({1}),
 "Total {0} for all items is zero, may be you should change 'Distribute Charges Based On'","Всего {0} для всех элементов равно нулю, может быть, вы должны изменить «Распределить плату на основе»",
@@ -3544,7 +3539,6 @@
 Company field is required,Поле компании обязательно для заполнения,
 Creating Dimensions...,Создание размеров ...,
 Duplicate entry against the item code {0} and manufacturer {1},Повторяющаяся запись с кодом товара {0} и производителем {1},
-Import Chart Of Accounts from CSV / Excel files,Импорт плана счетов из файлов CSV / Excel,
 Invalid GSTIN! The input you've entered doesn't match the GSTIN format for UIN Holders or Non-Resident OIDAR Service Providers,Неверный GSTIN! Введенный вами ввод не соответствует формату GSTIN для владельцев UIN или нерезидентов OIDAR.,
 Invoice Grand Total,Счет-фактура Grand Total,
 Last carbon check date cannot be a future date,Дата последней проверки углерода не может быть датой в будущем,
@@ -3921,7 +3915,6 @@
 Plaid public token error,Ошибка публичного токена,
 Plaid transactions sync error,Ошибка синхронизации плед транзакций,
 Please check the error log for details about the import errors,"Пожалуйста, проверьте журнал ошибок для деталей об ошибках импорта",
-Please click on the following link to set your new password,"Пожалуйста, нажмите на следующую ссылку, чтобы установить новый пароль",
 Please create <b>DATEV Settings</b> for Company <b>{}</b>.,"Пожалуйста, создайте <b>настройки DATEV</b> для компании <b>{}</b> .",
 Please create adjustment Journal Entry for amount {0} ,"Пожалуйста, создайте корректировку Записи в журнале для суммы {0}",
 Please do not create more than 500 items at a time,"Пожалуйста, не создавайте более 500 предметов одновременно",
@@ -3997,6 +3990,7 @@
 Release date must be in the future,Дата релиза должна быть в будущем,
 Relieving Date must be greater than or equal to Date of Joining,Дата освобождения должна быть больше или равна дате присоединения,
 Rename,Переименовать,
+Rename Not Allowed,Переименовать не разрешено,
 Repayment Method is mandatory for term loans,Метод погашения обязателен для срочных кредитов,
 Repayment Start Date is mandatory for term loans,Дата начала погашения обязательна для срочных кредитов,
 Report Item,Элемент отчета,
@@ -4043,7 +4037,6 @@
 Select All,Выбрать Все,
 Select Difference Account,Выберите учетную запись разницы,
 Select a Default Priority.,Выберите приоритет по умолчанию.,
-Select a Supplier from the Default Supplier List of the items below.,Выберите поставщика из списка поставщиков по умолчанию из пунктов ниже.,
 Select a company,Выберите компанию,
 Select finance book for the item {0} at row {1},Выберите финансовую книгу для позиции {0} в строке {1},
 Select only one Priority as Default.,Выберите только один приоритет по умолчанию.,
@@ -4247,7 +4240,6 @@
 Actual ,Фактически,
 Add to cart,Добавить в корзину,
 Budget,бюджет,
-Chart Of Accounts Importer,План счетов Импортер,
 Chart of Accounts,План счетов,
 Customer database.,База данных клиентов.,
 Days Since Last order,Дни с последнего Заказать,
@@ -4546,7 +4538,6 @@
 Check Supplier Invoice Number Uniqueness,Проверять Уникальность Номера Счетов получаемых от Поставщика,
 Make Payment via Journal Entry,Платежи через журнал Вход,
 Unlink Payment on Cancellation of Invoice,Unlink Оплата об аннулировании счета-фактуры,
-Unlink Advance Payment on Cancelation of Order,Отмена авансового платежа при отмене заказа,
 Book Asset Depreciation Entry Automatically,Автоматическое внесение амортизации в книгу,
 Automatically Add Taxes and Charges from Item Tax Template,Автоматически добавлять налоги и сборы из шаблона налога на товар,
 Automatically Fetch Payment Terms,Автоматически получать условия оплаты,
@@ -4940,7 +4931,6 @@
 POS Customer Group,POS Группа клиентов,
 POS Field,POS Field,
 POS Item Group,POS Item Group,
-[Select],[Выберите],
 Company Address,Адрес компании,
 Update Stock,Обновить склад,
 Ignore Pricing Rule,Игнорировать правило ценообразования,
@@ -6481,7 +6471,6 @@
 Appraisal Template,Оценка шаблона,
 For Employee Name,Для имени сотрудника,
 Goals,Цели,
-Calculate Total Score,Рассчитать общую сумму,
 Total Score (Out of 5),Всего рейтинг (из 5),
 "Any other remarks, noteworthy effort that should go in the records.","Любые другие замечания, отметить усилия, которые должны идти в записях.",
 Appraisal Goal,Оценка Гол,
@@ -6599,11 +6588,6 @@
 Reason for Leaving,Причина увольнения,
 Leave Encashed?,Оставьте инкассированы?,
 Encashment Date,Инкассация Дата,
-Exit Interview Details,Выход Интервью Подробности,
-Held On,Состоявшемся,
-Reason for Resignation,Причина отставки,
-Better Prospects,Потенциальные покупатели,
-Health Concerns,Проблемы здоровья,
 New Workplace,Новый рабочий участок,
 HR-EAD-.YYYY.-,HR-EAD-.YYYY.-,
 Returned Amount,Возвращенная сумма,
@@ -8239,9 +8223,6 @@
 Manufacturers used in Items,Производители использовали в пунктах,
 Limited to 12 characters,Ограничено до 12 символов,
 MAT-MR-.YYYY.-,МАТ-MR-.YYYY.-,
-Set Warehouse,Установить склад,
-Sets 'For Warehouse' in each row of the Items table.,Устанавливает «На склад» в каждой строке таблицы «Предметы».,
-Requested For,Запрошено для,
 Partially Ordered,Частично заказано,
 Transferred,Переданы,
 % Ordered,% заказано,
@@ -8690,8 +8671,6 @@
 Select warehouse for material requests,Выберите склад для запросов материалов,
 Transfer Materials For Warehouse {0},Передача материалов на склад {0},
 Production Plan Material Request Warehouse,Склад запроса материалов производственного плана,
-Set From Warehouse,Набор со склада,
-Source Warehouse (Material Transfer),Исходный склад (передача материалов),
 Sets 'Source Warehouse' in each row of the items table.,Устанавливает «Исходный склад» в каждой строке таблицы элементов.,
 Sets 'Target Warehouse' in each row of the items table.,Устанавливает «Целевой склад» в каждой строке таблицы товаров.,
 Show Cancelled Entries,Показать отмененные записи,
@@ -9157,7 +9136,6 @@
 Is Income Tax Component,Компонент подоходного налога,
 Component properties and references ,Свойства компонентов и ссылки,
 Additional Salary ,Дополнительная зарплата,
-Condtion and formula,Условия и формула,
 Unmarked days,Неотмеченные дни,
 Absent Days,Отсутствующие дни,
 Conditions and Formula variable and example,"Условия и формула, переменная и пример",
@@ -9444,7 +9422,6 @@
 Please check your Plaid client ID and secret values,"Пожалуйста, проверьте свой идентификатор клиента Plaid и секретные значения",
 Bank transaction creation error,Ошибка создания банковской транзакции,
 Unit of Measurement,Единица измерения,
-Row #{}: Selling rate for item {} is lower than its {}. Selling rate should be atleast {},"Строка № {}: уровень продажи товара {} ниже, чем его {}. Уровень продаж должен быть как минимум {}",
 Fiscal Year {0} Does Not Exist,Финансовый год {0} не существует,
 Row # {0}: Returned Item {1} does not exist in {2} {3},Строка № {0}: возвращенный товар {1} не существует в {2} {3},
 Valuation type charges can not be marked as Inclusive,Плата за тип оценки не может быть помечена как «Включая»,
@@ -9598,8 +9575,60 @@
 Response Time for {0} priority in row {1} can't be greater than Resolution Time.,Время отклика для приоритета {0} в строке {1} не может быть больше времени разрешения.,
 {0} is not enabled in {1},{0} не включен в {1},
 Group by Material Request,Группировать по запросу материала,
-"Row {0}: For Supplier {0}, Email Address is Required to Send Email",Строка {0}: для поставщика {0} адрес электронной почты необходим для отправки электронной почты.,
 Email Sent to Supplier {0},Электронное письмо отправлено поставщику {0},
 "The Access to Request for Quotation From Portal is Disabled. To Allow Access, Enable it in Portal Settings.","Доступ к запросу коммерческого предложения с портала отключен. Чтобы разрешить доступ, включите его в настройках портала.",
 Supplier Quotation {0} Created,Предложение поставщика {0} создано,
 Valid till Date cannot be before Transaction Date,Действителен до Дата не может быть раньше Даты транзакции,
+Unlink Advance Payment on Cancellation of Order,Отменить связь авансового платежа при отмене заказа,
+"Simple Python Expression, Example: territory != 'All Territories'","Простое выражение Python, пример: территория! = &#39;Все территории&#39;",
+Sales Contributions and Incentives,Взносы с продаж и поощрения,
+Sourced by Supplier,Источник: поставщик,
+Total weightage assigned should be 100%.<br>It is {0},Общий вес должен быть 100%.<br> Это {0},
+Account {0} exists in parent company {1}.,Аккаунт {0} существует в материнской компании {1}.,
+"To overrule this, enable '{0}' in company {1}","Чтобы отменить это, включите &quot;{0}&quot; в компании {1}",
+Invalid condition expression,Недействительное выражение условия,
+Please Select a Company First,"Пожалуйста, сначала выберите компанию",
+Please Select Both Company and Party Type First,"Пожалуйста, сначала выберите компанию и тип стороны",
+Provide the invoice portion in percent,Укажите часть счета в процентах,
+Give number of days according to prior selection,Укажите количество дней в соответствии с предыдущим выбором,
+Email Details,Электронная почта Подробности,
+"Select a greeting for the receiver. E.g. Mr., Ms., etc.","Выберите приветствие для получателя. Например, мистер, мисс и т. Д.",
+Preview Email,Предварительный просмотр электронной почты,
+Please select a Supplier,"Пожалуйста, выберите поставщика",
+Supplier Lead Time (days),Срок поставки поставщика (дни),
+"Home, Work, etc.","Дом, работа и т. Д.",
+Exit Interview Held On,Завершить собеседование,
+Condition and formula,Условие и формула,
+Sets 'Target Warehouse' in each row of the Items table.,Устанавливает «Целевой склад» в каждой строке таблицы «Предметы».,
+Sets 'Source Warehouse' in each row of the Items table.,Устанавливает «Исходный склад» в каждой строке таблицы «Предметы».,
+POS Register,POS регистр,
+"Can not filter based on POS Profile, if grouped by POS Profile","Невозможно фильтровать по профилю POS, если он сгруппирован по профилю POS",
+"Can not filter based on Customer, if grouped by Customer","Невозможно фильтровать по клиенту, если они сгруппированы по клиенту",
+"Can not filter based on Cashier, if grouped by Cashier","Невозможно фильтровать по кассиру, если они сгруппированы по кассе",
+Payment Method,Способ оплаты,
+"Can not filter based on Payment Method, if grouped by Payment Method","Невозможно фильтровать по способу оплаты, если они сгруппированы по способу оплаты",
+Supplier Quotation Comparison,Сравнение предложений поставщиков,
+Price per Unit (Stock UOM),Цена за единицу (складские единицы измерения),
+Group by Supplier,Группировать по поставщикам,
+Group by Item,Группировать по пунктам,
+Remember to set {field_label}. It is required by {regulation}.,Не забудьте установить {field_label}. Этого требует {регулирование}.,
+Enrollment Date cannot be before the Start Date of the Academic Year {0},Дата зачисления не может быть раньше даты начала учебного года {0},
+Enrollment Date cannot be after the End Date of the Academic Term {0},Дата зачисления не может быть позже даты окончания академического семестра {0},
+Enrollment Date cannot be before the Start Date of the Academic Term {0},Дата зачисления не может быть раньше даты начала академического семестра {0},
+Posting future transactions are not allowed due to Immutable Ledger,Проводка будущих транзакций не разрешена из-за неизменяемой бухгалтерской книги,
+Future Posting Not Allowed,Размещение в будущем запрещено,
+"To enable Capital Work in Progress Accounting, ","Чтобы включить ведение учета капитальных работ,",
+you must select Capital Work in Progress Account in accounts table,в таблице счетов необходимо выбрать «Текущие капитальные работы».,
+You can also set default CWIP account in Company {},Вы также можете установить учетную запись CWIP по умолчанию в Company {},
+The Request for Quotation can be accessed by clicking on the following button,"Получить доступ к запросу коммерческого предложения можно, нажав следующую кнопку",
+Regards,С уважением,
+Please click on the following button to set your new password,"Пожалуйста, нажмите на следующую кнопку, чтобы установить новый пароль",
+Update Password,Обновить пароль,
+Row #{}: Selling rate for item {} is lower than its {}. Selling {} should be atleast {},"Строка № {}: уровень продажи товара {} ниже, чем его {}. Продажа {} должна быть как минимум {}",
+You can alternatively disable selling price validation in {} to bypass this validation.,"Вы также можете отключить проверку продажной цены в {}, чтобы обойти эту проверку.",
+Invalid Selling Price,Недействительная цена продажи,
+Address needs to be linked to a Company. Please add a row for Company in the Links table.,"Адрес должен быть привязан к компании. Пожалуйста, добавьте строку для компании в таблицу ссылок.",
+Company Not Linked,Компания не связана,
+Import Chart of Accounts from CSV / Excel files,Импорт плана счетов из файлов CSV / Excel,
+Completed Qty cannot be greater than 'Qty to Manufacture',"Завершенное количество не может быть больше, чем «Количество для изготовления»",
+"Row {0}: For Supplier {1}, Email Address is Required to send an email",Строка {0}: для поставщика {1} адрес электронной почты необходим для отправки электронного письма.,
diff --git a/erpnext/translations/rw.csv b/erpnext/translations/rw.csv
index 1c54390..0a658a5 100644
--- a/erpnext/translations/rw.csv
+++ b/erpnext/translations/rw.csv
@@ -521,7 +521,6 @@
 Chargeble,Kwishyurwa,
 Charges are updated in Purchase Receipt against each item,Amafaranga yishyurwa mugihe cyo kugura ibicuruzwa kuri buri kintu,
 "Charges will be distributed proportionately based on item qty or amount, as per your selection","Amafaranga azagabanywa ukurikije ibintu qty cyangwa umubare, nkuko wahisemo",
-Chart Of Accounts,Imbonerahamwe ya Konti,
 Chart of Cost Centers,Imbonerahamwe y&#39;Ibiciro,
 Check all,Reba byose,
 Checkout,Kugenzura,
@@ -581,7 +580,6 @@
 Compensatory Off,Indishyi,
 Compensatory leave request days not in valid holidays,Ikiruhuko cyindishyi zisaba iminsi ntabwo muminsi mikuru yemewe,
 Complaint,Ikirego,
-Completed Qty can not be greater than 'Qty to Manufacture',Qty yuzuye ntishobora kuba irenze &#39;Qty to Manufacture&#39;,
 Completion Date,Itariki yo kurangiriraho,
 Computer,Mudasobwa,
 Condition,Imiterere,
@@ -2033,7 +2031,6 @@
 Please select Charge Type first,Nyamuneka hitamo Ubwoko bwa Charge,
 Please select Company,Nyamuneka hitamo Isosiyete,
 Please select Company and Designation,Nyamuneka hitamo Isosiyete no Kugenwa,
-Please select Company and Party Type first,Nyamuneka hitamo Isosiyete nubwoko bwIshyaka mbere,
 Please select Company and Posting Date to getting entries,Nyamuneka hitamo Isosiyete no kohereza Itariki kugirango ubone ibyinjira,
 Please select Company first,Nyamuneka hitamo Isosiyete,
 Please select Completion Date for Completed Asset Maintenance Log,Nyamuneka hitamo Itariki Yuzuye yo Kuzuza Umutungo wuzuye,
@@ -2980,7 +2977,6 @@
 The name of your company for which you are setting up this system.,Izina rya sosiyete yawe urimo gushiraho iyi sisitemu.,
 The number of shares and the share numbers are inconsistent,Umubare wimigabane numubare wimigabane ntaho uhuriye,
 The payment gateway account in plan {0} is different from the payment gateway account in this payment request,Konti yo kwishura yishyurwa muri gahunda {0} itandukanye na konte yo kwishura muri iki cyifuzo cyo kwishyura,
-The request for quotation can be accessed by clicking on the following link,Icyifuzo cyo gusubiramo gishobora kugerwaho ukanze kumurongo ukurikira,
 The selected BOMs are not for the same item,BOM zatoranijwe ntabwo arikintu kimwe,
 The selected item cannot have Batch,Ikintu cyatoranijwe ntigishobora kugira Batch,
 The seller and the buyer cannot be the same,Umugurisha nuwaguze ntibashobora kuba bamwe,
@@ -3130,7 +3126,6 @@
 Total flexible benefit component amount {0} should not be less than max benefits {1},Igiteranyo cyinyungu zingirakamaro zingana {0} ntigomba kuba munsi yinyungu nini {1},
 Total hours: {0},Amasaha yose: {0},
 Total leaves allocated is mandatory for Leave Type {0},Amababi yose yatanzwe ni itegeko kuburuhuka Ubwoko {0},
-Total weightage assigned should be 100%. It is {0},Ibiro byose byahawe bigomba kuba 100%. Ni {0},
 Total working hours should not be greater than max working hours {0},Amasaha yose yakazi ntagomba kurenza amasaha yakazi {0},
 Total {0} ({1}),Igiteranyo {0} ({1}),
 "Total {0} for all items is zero, may be you should change 'Distribute Charges Based On'","Igiteranyo {0} kubintu byose ni zeru, birashoboka ko ugomba guhindura &#39;Gukwirakwiza amafaranga ashingiye kuri&#39;",
@@ -3544,7 +3539,6 @@
 Company field is required,Umwanya w&#39;ikigo urakenewe,
 Creating Dimensions...,Gukora Ibipimo ...,
 Duplicate entry against the item code {0} and manufacturer {1},Kwigana ibyanditswe birwanya kode {0} nuwabikoze {1},
-Import Chart Of Accounts from CSV / Excel files,Kuzana Imbonerahamwe ya Konti kuva muri dosiye ya CSV / Excel,
 Invalid GSTIN! The input you've entered doesn't match the GSTIN format for UIN Holders or Non-Resident OIDAR Service Providers,GSTIN itemewe! Iyinjiza winjiye ntabwo ihuye nimiterere ya GSTIN kubafite UIN cyangwa abatanga serivisi ya OIDAR idatuye,
 Invoice Grand Total,Inyemezabuguzi Yuzuye,
 Last carbon check date cannot be a future date,Itariki yanyuma yo kugenzura karubone ntishobora kuba itariki izaza,
@@ -3921,7 +3915,6 @@
 Plaid public token error,Shyira ahagaragara ikosa rusange,
 Plaid transactions sync error,Kwishura ibikorwa byo guhuza ikosa,
 Please check the error log for details about the import errors,Nyamuneka reba amakosa yibisobanuro birambuye kubyerekeye amakosa yatumijwe,
-Please click on the following link to set your new password,Nyamuneka kanda kumurongo ukurikira kugirango ushireho ijambo ryibanga rishya,
 Please create <b>DATEV Settings</b> for Company <b>{}</b>.,Nyamuneka kora <b>DATEV Igenamiterere</b> rya Sosiyete <b>{}</b> .,
 Please create adjustment Journal Entry for amount {0} ,Nyamuneka kora ibinyamakuru byinjira kumafaranga {0},
 Please do not create more than 500 items at a time,Nyamuneka ntukareme ibintu birenga 500 icyarimwe,
@@ -3997,6 +3990,7 @@
 Release date must be in the future,Itariki yo gusohora igomba kuba mugihe kizaza,
 Relieving Date must be greater than or equal to Date of Joining,Itariki Yoroheje igomba kuba irenze cyangwa ingana nitariki yo Kwinjira,
 Rename,Hindura izina,
+Rename Not Allowed,Guhindura izina Ntabwo byemewe,
 Repayment Method is mandatory for term loans,Uburyo bwo kwishyura ni itegeko ku nguzanyo zigihe gito,
 Repayment Start Date is mandatory for term loans,Itariki yo Gutangiriraho ni itegeko ku nguzanyo zigihe,
 Report Item,Raporo Ingingo,
@@ -4043,7 +4037,6 @@
 Select All,Hitamo byose,
 Select Difference Account,Hitamo Konti Itandukanye,
 Select a Default Priority.,Hitamo Icyambere.,
-Select a Supplier from the Default Supplier List of the items below.,Hitamo Utanga isoko kuva Mubisanzwe Utanga Urutonde rwibintu bikurikira.,
 Select a company,Hitamo isosiyete,
 Select finance book for the item {0} at row {1},Hitamo igitabo cyimari kubintu {0} kumurongo {1},
 Select only one Priority as Default.,Hitamo Icyambere kimwe gusa nkibisanzwe.,
@@ -4247,7 +4240,6 @@
 Actual ,Mubyukuri,
 Add to cart,Ongera ku igare,
 Budget,Bije,
-Chart Of Accounts Importer,Imbonerahamwe ya Konti Yinjiza,
 Chart of Accounts,Imbonerahamwe ya Konti,
 Customer database.,Ububikoshingiro bwabakiriya.,
 Days Since Last order,Iminsi Kuva Urutonde Rwanyuma,
@@ -4546,7 +4538,6 @@
 Check Supplier Invoice Number Uniqueness,Reba inyemezabuguzi itanga inomero yihariye,
 Make Payment via Journal Entry,Kwishura ukoresheje Ikinyamakuru,
 Unlink Payment on Cancellation of Invoice,Kuramo ubwishyu ku iseswa rya fagitire,
-Unlink Advance Payment on Cancelation of Order,Kuramo amafaranga yo kwishyura mbere yo guhagarika itegeko,
 Book Asset Depreciation Entry Automatically,Igitabo Umutungo wo guta agaciro Kwinjira mu buryo bwikora,
 Automatically Add Taxes and Charges from Item Tax Template,Mu buryo bwikora Ongeraho Imisoro n&#39;amahoro biva mubintu by&#39;imisoro,
 Automatically Fetch Payment Terms,Mu buryo bwikora Shakisha Amasezerano yo Kwishura,
@@ -4940,7 +4931,6 @@
 POS Customer Group,Itsinda ry&#39;abakiriya POS,
 POS Field,Umwanya wa POS,
 POS Item Group,Itsinda rya POS,
-[Select],[Hitamo],
 Company Address,Aderesi ya sosiyete,
 Update Stock,Kuvugurura ububiko,
 Ignore Pricing Rule,Kwirengagiza amategeko agenga ibiciro,
@@ -6481,7 +6471,6 @@
 Appraisal Template,Inyandikorugero,
 For Employee Name,Izina ry&#39;abakozi,
 Goals,Intego,
-Calculate Total Score,Kubara amanota yose,
 Total Score (Out of 5),Amanota Yose (Kuri 5),
 "Any other remarks, noteworthy effort that should go in the records.","Andi magambo yose, imbaraga zidasanzwe zigomba kujya mubyanditswe.",
 Appraisal Goal,Intego yo gusuzuma,
@@ -6599,11 +6588,6 @@
 Reason for Leaving,Impamvu yo kugenda,
 Leave Encashed?,Kureka?,
 Encashment Date,Itariki yo Kuzuza,
-Exit Interview Details,Sohora Ibisobanuro birambuye,
-Held On,Bikorewe,
-Reason for Resignation,Impamvu yo kwegura,
-Better Prospects,Ibyiringiro byiza,
-Health Concerns,Ibibazo byubuzima,
 New Workplace,Umwanya mushya,
 HR-EAD-.YYYY.-,HR-EAD-.YYYY.-,
 Returned Amount,Amafaranga yagaruwe,
@@ -8239,9 +8223,6 @@
 Manufacturers used in Items,Inganda zikoreshwa mubintu,
 Limited to 12 characters,Kugarukira ku nyuguti 12,
 MAT-MR-.YYYY.-,MAT-MR-.YYYY.-,
-Set Warehouse,Shiraho ububiko,
-Sets 'For Warehouse' in each row of the Items table.,Gushiraho &#39;Kububiko&#39; muri buri murongo wibintu byimbonerahamwe.,
-Requested For,Basabwe Kuri,
 Partially Ordered,Biteganijwe,
 Transferred,Yimuriwe,
 % Ordered,% Yategetse,
@@ -8690,8 +8671,6 @@
 Select warehouse for material requests,Hitamo ububiko bwibisabwa,
 Transfer Materials For Warehouse {0},Kohereza Ibikoresho Kububiko {0},
 Production Plan Material Request Warehouse,Gahunda yumusaruro Ibikoresho bisabwa ububiko,
-Set From Warehouse,Shyira mu bubiko,
-Source Warehouse (Material Transfer),Ububiko bw&#39;inkomoko (Kohereza ibikoresho),
 Sets 'Source Warehouse' in each row of the items table.,Gushiraho &#39;Inkomoko yububiko&#39; muri buri murongo wibintu kumeza.,
 Sets 'Target Warehouse' in each row of the items table.,Gushiraho &#39;Intego Ububiko&#39; muri buri murongo wibintu kumeza.,
 Show Cancelled Entries,Erekana ibyasibwe,
@@ -9157,7 +9136,6 @@
 Is Income Tax Component,Nibigize Umusoro ku nyungu,
 Component properties and references ,Ibikoresho bigize ibice,
 Additional Salary ,Umushahara w&#39;inyongera,
-Condtion and formula,Imiterere na formula,
 Unmarked days,Iminsi itamenyekanye,
 Absent Days,Iminsi idahari,
 Conditions and Formula variable and example,Imiterere na formula ihindagurika nurugero,
@@ -9444,7 +9422,6 @@
 Please check your Plaid client ID and secret values,Nyamuneka reba indangamuntu yawe ya Plaid nindangagaciro,
 Bank transaction creation error,Ikosa ryo gushiraho banki,
 Unit of Measurement,Igice cyo gupima,
-Row #{}: Selling rate for item {} is lower than its {}. Selling rate should be atleast {},Umurongo # {}: Igiciro cyo kugurisha kubintu {} kiri munsi yacyo {}. Igiciro cyo kugurisha kigomba kuba byibuze {},
 Fiscal Year {0} Does Not Exist,Umwaka w&#39;Imari {0} Ntiriho,
 Row # {0}: Returned Item {1} does not exist in {2} {3},Umurongo # {0}: Ikintu cyagarutse {1} ntikibaho muri {2} {3},
 Valuation type charges can not be marked as Inclusive,Ubwoko bw&#39;igiciro cyo kwishyurwa ntibushobora gushyirwaho nkibirimo,
@@ -9598,8 +9575,60 @@
 Response Time for {0} priority in row {1} can't be greater than Resolution Time.,Igihe cyo gusubiza kuri {0} icyambere kumurongo {1} ntishobora kurenza igihe cyo gukemura.,
 {0} is not enabled in {1},{0} ntabwo ishoboye muri {1},
 Group by Material Request,Itsinda kubisabwa,
-"Row {0}: For Supplier {0}, Email Address is Required to Send Email","Umurongo {0}: Kubatanga {0}, Aderesi imeri irasabwa kohereza imeri",
 Email Sent to Supplier {0},Imeri yoherejwe kubitanga {0},
 "The Access to Request for Quotation From Portal is Disabled. To Allow Access, Enable it in Portal Settings.","Kubona Kubisaba Kuva Kumurongo Byahagaritswe. Kwemerera Kwinjira, Gushoboza muri Igenamiterere rya Port.",
 Supplier Quotation {0} Created,Abatanga isoko {0} Byakozwe,
 Valid till Date cannot be before Transaction Date,Byemewe kugeza Itariki ntishobora kuba mbere yitariki yo gucuruza,
+Unlink Advance Payment on Cancellation of Order,Kuramo amafaranga yo kwishyura mbere yo guhagarika itegeko,
+"Simple Python Expression, Example: territory != 'All Territories'","Imvugo yoroshye ya Python, Urugero: ifasi! = &#39;Intara zose&#39;",
+Sales Contributions and Incentives,Umusanzu wo kugurisha no gutera inkunga,
+Sourced by Supplier,Sourced by Supplier,
+Total weightage assigned should be 100%.<br>It is {0},Ibiro byose byahawe bigomba kuba 100%.<br> Ni {0},
+Account {0} exists in parent company {1}.,Konti {0} ibaho mubigo byababyeyi {1}.,
+"To overrule this, enable '{0}' in company {1}","Kurenga ibi, shoboza &#39;{0}&#39; muri sosiyete {1}",
+Invalid condition expression,Imvugo itemewe,
+Please Select a Company First,Nyamuneka Hitamo Isosiyete Mbere,
+Please Select Both Company and Party Type First,Nyamuneka Hitamo Isosiyete Yombi nubwoko bwambere,
+Provide the invoice portion in percent,Tanga igice cya fagitire ku ijana,
+Give number of days according to prior selection,Tanga umubare wiminsi ukurikije guhitamo mbere,
+Email Details,Imeri Ibisobanuro,
+"Select a greeting for the receiver. E.g. Mr., Ms., etc.","Hitamo indamutso kubakira. Urugero Bwana, Madamu, nibindi",
+Preview Email,Imbere ya imeri,
+Please select a Supplier,Nyamuneka hitamo Utanga isoko,
+Supplier Lead Time (days),Utanga isoko Igihe (iminsi),
+"Home, Work, etc.","Urugo, Akazi, nibindi",
+Exit Interview Held On,Gusohoka Kubazwa Byakozwe,
+Condition and formula,Imiterere na formula,
+Sets 'Target Warehouse' in each row of the Items table.,Gushiraho &#39;Intego Ububiko&#39; muri buri murongo wibintu.,
+Sets 'Source Warehouse' in each row of the Items table.,Gushiraho &#39;Inkomoko yububiko&#39; muri buri murongo wibintu.,
+POS Register,Kwiyandikisha POS,
+"Can not filter based on POS Profile, if grouped by POS Profile","Ntushobora gushungura ukurikije Umwirondoro wa POS, niba uhuriweho na POS Umwirondoro",
+"Can not filter based on Customer, if grouped by Customer","Ntushobora gushungura ukurikije Umukiriya, niba uhurijwe hamwe nabakiriya",
+"Can not filter based on Cashier, if grouped by Cashier","Ntushobora gushungura ushingiye kuri Cashier, niba uhujwe na Cashier",
+Payment Method,Uburyo bwo Kwishura,
+"Can not filter based on Payment Method, if grouped by Payment Method","Ntushobora gushungura ukurikije uburyo bwo Kwishura, niba byashyizwe hamwe nuburyo bwo Kwishura",
+Supplier Quotation Comparison,Kugereranya Abatanga isoko,
+Price per Unit (Stock UOM),Igiciro kuri buri gice (Stock UOM),
+Group by Supplier,Itsinda ryabatanga isoko,
+Group by Item,Itsinda ku kintu,
+Remember to set {field_label}. It is required by {regulation}.,Wibuke gushiraho {umurima_label}. Irasabwa na {amabwiriza}.,
+Enrollment Date cannot be before the Start Date of the Academic Year {0},Itariki yo kwiyandikisha ntishobora kuba mbere yitariki yo gutangiriraho umwaka wamasomo {0},
+Enrollment Date cannot be after the End Date of the Academic Term {0},Itariki yo kwiyandikisha ntishobora kuba nyuma yitariki yo kurangiriraho igihe cyamasomo {0},
+Enrollment Date cannot be before the Start Date of the Academic Term {0},Itariki yo kwiyandikisha ntishobora kuba mbere yitariki yo gutangiriraho igihe cyamasomo {0},
+Posting future transactions are not allowed due to Immutable Ledger,Kohereza ibikorwa bizaza ntibyemewe kubera Immutable Ledger,
+Future Posting Not Allowed,Kohereza ejo hazaza ntibyemewe,
+"To enable Capital Work in Progress Accounting, ","Gushoboza Igishoro Cyakazi Mubikorwa Byibaruramari,",
+you must select Capital Work in Progress Account in accounts table,ugomba guhitamo Igishoro Cyakazi muri Konti Iterambere mumeza ya konti,
+You can also set default CWIP account in Company {},Urashobora kandi gushiraho konti isanzwe ya CWIP muri Company {},
+The Request for Quotation can be accessed by clicking on the following button,Gusaba Quotation birashobora kugerwaho ukanze kuri buto ikurikira,
+Regards,Kubaha,
+Please click on the following button to set your new password,Nyamuneka kanda kuri buto ikurikira kugirango ushireho ijambo ryibanga rishya,
+Update Password,Kuvugurura ijambo ryibanga,
+Row #{}: Selling rate for item {} is lower than its {}. Selling {} should be atleast {},Umurongo # {}: Igiciro cyo kugurisha kubintu {} kiri munsi yacyo {}. Kugurisha {} bigomba kuba byibura {},
+You can alternatively disable selling price validation in {} to bypass this validation.,Urashobora guhitamo guhagarika kugurisha kwemeza muri {} kugirango wirengagize iki cyemezo.,
+Invalid Selling Price,Igiciro cyo kugurisha kitemewe,
+Address needs to be linked to a Company. Please add a row for Company in the Links table.,Aderesi igomba guhuzwa na Sosiyete. Nyamuneka ongeraho umurongo kuri Sosiyete kumeza Ihuza.,
+Company Not Linked,Isosiyete idahujwe,
+Import Chart of Accounts from CSV / Excel files,Kuzana Imbonerahamwe ya Konti kuva muri dosiye ya CSV / Excel,
+Completed Qty cannot be greater than 'Qty to Manufacture',Qty yuzuye ntishobora kuba irenze &#39;Qty to Manufacture&#39;,
+"Row {0}: For Supplier {1}, Email Address is Required to send an email","Umurongo {0}: Kubatanga {1}, Aderesi imeri irasabwa kohereza imeri",
diff --git a/erpnext/translations/si.csv b/erpnext/translations/si.csv
index 2fc5b32..0058eae 100644
--- a/erpnext/translations/si.csv
+++ b/erpnext/translations/si.csv
@@ -521,7 +521,6 @@
 Chargeble,අයකිරීම,
 Charges are updated in Purchase Receipt against each item,ගාස්තු එක් එක් අයිතමය එරෙහිව මිලදී ගැනීම රිසිට්පත යාවත්කාලීන වේ,
 "Charges will be distributed proportionately based on item qty or amount, as per your selection","ගාස්තු ඔබේ තෝරාගැනීම අනුව, අයිතමය යවන ලද හෝ මුදල මත පදනම් වන අතර සමානුපාතික බෙදා දීමට නියමිතය",
-Chart Of Accounts,ගිණුම් සටහන,
 Chart of Cost Centers,පිරිවැය මධ්යස්ථාන සටහන,
 Check all,සියල්ල පරීක්ෂා කරන්න,
 Checkout,පරීක්ෂාකාරී වන්න,
@@ -581,7 +580,6 @@
 Compensatory Off,Off වන්දි,
 Compensatory leave request days not in valid holidays,වලංගු නිවාඩු නිවාඩු නොලැබේ,
 Complaint,පැමිණිල්ලක්,
-Completed Qty can not be greater than 'Qty to Manufacture',අවසන් යවන ලද &#39;යවන ලද නිෂ්පාදනය සඳහා&#39; ට වඩා වැඩි විය නොහැක,
 Completion Date,අවසන් කරන දිනය,
 Computer,පරිගණක,
 Condition,තත්වය,
@@ -2033,7 +2031,6 @@
 Please select Charge Type first,කරුණාකර භාර වර්ගය පළමු තෝරා,
 Please select Company,කරුණාකර සමාගම තෝරා,
 Please select Company and Designation,කරුණාකර සමාගම සහ තනතුර තෝරන්න,
-Please select Company and Party Type first,කරුණාකර ප්රථම සමාගම හා පක්ෂ වර්ගය තෝරා,
 Please select Company and Posting Date to getting entries,කරුණාකර ඇතුළත් කිරීම සඳහා සමාගම හා දිනය පළ කිරීම තෝරන්න,
 Please select Company first,කරුණාකර සමාගම පළමු තෝරා,
 Please select Completion Date for Completed Asset Maintenance Log,සම්පුර්ණ කළ වත්කම් නඩත්තු ලොගය සඳහා අවසන් දිනය තෝරන්න,
@@ -2980,7 +2977,6 @@
 The name of your company for which you are setting up this system.,ඔබ මෙම පද්ධතිය සකස්කර සඳහා ඔබේ සමාගම සඳහා වන නම.,
 The number of shares and the share numbers are inconsistent,කොටස් ගණන හා කොටස් අංකය අස්ථාවර ය,
 The payment gateway account in plan {0} is different from the payment gateway account in this payment request,{0} සැලැස්මෙහි ගෙවීම් ගෝල්ඩන් ගිණුම මෙම ගෙවීම් ඉල්ලීමේ ගෙවීම් ග්ලැට්වුඩ් ගිණුමෙන් වෙනස් වේ,
-The request for quotation can be accessed by clicking on the following link,උද්ධෘත සඳහා කල ඉල්ලීම පහත සබැඳිය ක්ලික් කිරීම මගින් ප්රවේශ විය හැකි,
 The selected BOMs are not for the same item,තෝරාගත් BOMs එම අයිතමය සඳහා නොවේ,
 The selected item cannot have Batch,තෝරාගත් අයිතමය කණ්ඩායම ලබා ගත නොහැකි,
 The seller and the buyer cannot be the same,විකිණුම්කරු සහ ගැනුම්කරු සමාන විය නොහැකිය,
@@ -3130,7 +3126,6 @@
 Total flexible benefit component amount {0} should not be less than max benefits {1},සම්පූර්ණ නම්යශීලී ප්රතිලාභ සංරචක ප්රමාණය {0} උපරිම ප්රතිලාභ වලට වඩා අඩු නොවේ {1},
 Total hours: {0},මුළු පැය: {0},
 Total leaves allocated is mandatory for Leave Type {0},Leave වර්ගය සඳහා වෙන් කර ඇති මුළු එකතුව {0},
-Total weightage assigned should be 100%. It is {0},පවරා මුළු weightage 100% ක් විය යුතුය. එය {0} වේ,
 Total working hours should not be greater than max working hours {0},මුළු කම්කරු පැය වැඩ කරන පැය {0} උපරිම වඩා වැඩි විය යුතු නැහැ,
 Total {0} ({1}),මුළු {0} ({1}),
 "Total {0} for all items is zero, may be you should change 'Distribute Charges Based On'",මුළු {0} සියළුම ශුන්ය වේ ඔබ &#39;මත පදනම් වූ ගාස්තු බෙදා හරින්න&#39; වෙනස් කළ යුතු ය විය හැකිය,
@@ -3544,7 +3539,6 @@
 Company field is required,සමාගම් ක්ෂේත්‍රය අවශ්‍යයි,
 Creating Dimensions...,මානයන් නිර්මාණය කිරීම ...,
 Duplicate entry against the item code {0} and manufacturer {1},Code 0 item සහ නිෂ්පාදකයා {1 item යන අයිතම කේතයට එරෙහිව අනුපිටපත් ඇතුළත් කිරීම,
-Import Chart Of Accounts from CSV / Excel files,CSV / Excel ලිපිගොනු වලින් ගිණුම් වගුව ආයාත කරන්න,
 Invalid GSTIN! The input you've entered doesn't match the GSTIN format for UIN Holders or Non-Resident OIDAR Service Providers,අවලංගු GSTIN! ඔබ ඇතුළත් කළ ආදානය UIN දරන්නන් හෝ අනේවාසික OIDAR සේවා සපයන්නන් සඳහා වන GSTIN ආකෘතියට නොගැලපේ,
 Invoice Grand Total,ඉන්වොයිස් ග්‍රෑන්ඩ් එකතුව,
 Last carbon check date cannot be a future date,අවසාන කාබන් පිරික්සුම් දිනය අනාගත දිනයක් විය නොහැක,
@@ -3921,7 +3915,6 @@
 Plaid public token error,පොදු ටෝකන දෝෂයකි,
 Plaid transactions sync error,සාමාන්‍ය ගනුදෙනු සමමුහුර්ත කිරීමේ දෝෂයකි,
 Please check the error log for details about the import errors,ආයාත කිරීමේ දෝෂ පිළිබඳ විස්තර සඳහා කරුණාකර දෝෂ ලොගය පරීක්ෂා කරන්න,
-Please click on the following link to set your new password,ඔබේ අලුත් රහස් වචනයක් සඳහා පහත සබැඳිය ක්ලික් කරන්න,
 Please create <b>DATEV Settings</b> for Company <b>{}</b>.,කරුණාකර සමාගම සඳහා <b>DATEV සැකසුම්</b> සාදන්න <b>}}</b> .,
 Please create adjustment Journal Entry for amount {0} ,කරුණාකර adjust 0 amount මුදල සඳහා ගැලපුම් ජර්නල් ප්‍රවේශය සාදන්න,
 Please do not create more than 500 items at a time,කරුණාකර වරකට අයිතම 500 කට වඩා සාදන්න එපා,
@@ -3997,6 +3990,7 @@
 Release date must be in the future,මුදා හැරීමේ දිනය අනාගතයේදී විය යුතුය,
 Relieving Date must be greater than or equal to Date of Joining,සහන දිනය එක්වන දිනයට වඩා වැඩි හෝ සමාන විය යුතුය,
 Rename,නැවත නම් කරන්න,
+Rename Not Allowed,නැවත නම් කිරීමට අවසර නැත,
 Repayment Method is mandatory for term loans,කාලීන ණය සඳහා ආපසු ගෙවීමේ ක්‍රමය අනිවාර්ය වේ,
 Repayment Start Date is mandatory for term loans,කාලීන ණය සඳහා ආපසු ගෙවීමේ ආරම්භක දිනය අනිවාර්ය වේ,
 Report Item,අයිතමය වාර්තා කරන්න,
@@ -4043,7 +4037,6 @@
 Select All,සියලු තෝරන්න,
 Select Difference Account,වෙනස ගිණුම තෝරන්න,
 Select a Default Priority.,පෙරනිමි ප්‍රමුඛතාවයක් තෝරන්න.,
-Select a Supplier from the Default Supplier List of the items below.,පෙරනිමි සැපයුම්කරු ලැයිස්තුවෙන් සැපයුම්කරුවෙකු තෝරන්න පහත අයිතම.,
 Select a company,සමාගමක් තෝරන්න,
 Select finance book for the item {0} at row {1},{1 row පේළියේ {0 item අයිතමය සඳහා මූල්‍ය පොත තෝරන්න,
 Select only one Priority as Default.,පෙරනිමියෙන් එක් ප්‍රමුඛතාවයක් පමණක් තෝරන්න.,
@@ -4247,7 +4240,6 @@
 Actual ,සැබෑ,
 Add to cart,ගැලට එක් කරන්න,
 Budget,අයවැය,
-Chart Of Accounts Importer,ගිණුම් ආනයනකරුගේ සටහන,
 Chart of Accounts,ගිණුම් සටහන,
 Customer database.,ගනුදෙනුකාර දත්ත ගබඩාව.,
 Days Since Last order,පසුගිය සාමය නිසා දින,
@@ -4546,7 +4538,6 @@
 Check Supplier Invoice Number Uniqueness,පරීක්ෂා කරන්න සැපයුම්කරු ඉන්වොයිසිය අංකය අනන්යතාව,
 Make Payment via Journal Entry,ජර්නල් සටහන් හරහා ගෙවීම් කරන්න,
 Unlink Payment on Cancellation of Invoice,ඉන්වොයිසිය අවලංගු මත ගෙවීම් විසන්ධි කරන්න,
-Unlink Advance Payment on Cancelation of Order,ඇණවුම අවලංගු කිරීම සඳහා අත්තිකාරම් ගෙවීම ඉවත් කරන්න,
 Book Asset Depreciation Entry Automatically,ස්වයංක්රීයව පොත වත්කම් ක්ෂය වීම සටහන්,
 Automatically Add Taxes and Charges from Item Tax Template,අයිතම බදු ආකෘතියෙන් බදු සහ ගාස්තු ස්වයංක්‍රීයව එක් කරන්න,
 Automatically Fetch Payment Terms,ගෙවීම් නියමයන් ස්වයංක්‍රීයව ලබා ගන්න,
@@ -4940,7 +4931,6 @@
 POS Customer Group,POS කස්ටමර් සමූහයේ,
 POS Field,POS ක්ෂේත්‍රය,
 POS Item Group,POS අයිතමය සමූහ,
-[Select],[තෝරන්න],
 Company Address,සමාගම ලිපිනය,
 Update Stock,කොටස් යාවත්කාලීන,
 Ignore Pricing Rule,මිල නියම කිරීම පාලනය නොසලකා,
@@ -6481,7 +6471,6 @@
 Appraisal Template,ඇගයීෙම් සැකිල්ල,
 For Employee Name,සේවක නම සඳහා,
 Goals,ඉලක්ක,
-Calculate Total Score,මුළු ලකුණු ගණනය,
 Total Score (Out of 5),මුළු ලකුණු (5 න්),
 "Any other remarks, noteworthy effort that should go in the records.","වෙනත් ඕනෑම ප්රකාශ, වාර්තාවන් යා යුතු බව විශේෂයෙන් සඳහන් කළ යුතු උත්සාහයක්.",
 Appraisal Goal,ඇගයීෙම් අරමුණ,
@@ -6599,11 +6588,6 @@
 Reason for Leaving,බැහැරවීම හේතුව,
 Leave Encashed?,Encashed ගියාද?,
 Encashment Date,හැකි ඥාතීන් නොවන දිනය,
-Exit Interview Details,පිටවීමේ සම්මුඛ පරීක්ෂණ විස්තර,
-Held On,දා පැවති,
-Reason for Resignation,ඉ ලා අස් හේතුව,
-Better Prospects,වඩා හොඳ අපේක්ෂා,
-Health Concerns,සෞඛ්ය කනස්සල්ල,
 New Workplace,නව සේවා ස්ථාන,
 HR-EAD-.YYYY.-,HR-EAD-.YYY-,
 Returned Amount,ආපසු ලබා දුන් මුදල,
@@ -8239,9 +8223,6 @@
 Manufacturers used in Items,අයිතම භාවිතා නිෂ්පාදකයන්,
 Limited to 12 characters,අක්ෂර 12 කට සීමා,
 MAT-MR-.YYYY.-,MAT-MR-.YYY-,
-Set Warehouse,ගබඩාව සකසන්න,
-Sets 'For Warehouse' in each row of the Items table.,අයිතම වගුවේ එක් එක් පේළියේ &#39;ගබඩාව සඳහා&#39; සකසයි.,
-Requested For,සඳහා ඉල්ලා,
 Partially Ordered,අර්ධ වශයෙන් ඇණවුම් කර ඇත,
 Transferred,මාරු,
 % Ordered,% අනුපිළිවලින්,
@@ -8690,8 +8671,6 @@
 Select warehouse for material requests,ද්‍රව්‍යමය ඉල්ලීම් සඳහා ගබඩාව තෝරන්න,
 Transfer Materials For Warehouse {0},ගබඩාව සඳහා ද්‍රව්‍ය මාරු කිරීම {0},
 Production Plan Material Request Warehouse,නිෂ්පාදන සැලැස්ම ද්‍රව්‍ය ඉල්ලීම් ගබඩාව,
-Set From Warehouse,ගබඩාවෙන් සකසන්න,
-Source Warehouse (Material Transfer),ප්‍රභව ගබඩාව (ද්‍රව්‍ය හුවමාරුව),
 Sets 'Source Warehouse' in each row of the items table.,අයිතම වගුවේ එක් එක් පේළියේ &#39;ප්‍රභව ගබඩාව&#39; සකසයි.,
 Sets 'Target Warehouse' in each row of the items table.,අයිතම වගුවේ එක් එක් පේළියේ &#39;ඉලක්කගත ගබඩාව&#39; සකසයි.,
 Show Cancelled Entries,අවලංගු කළ සටහන් පෙන්වන්න,
@@ -9157,7 +9136,6 @@
 Is Income Tax Component,ආදායම් බදු සංරචකය වේ,
 Component properties and references ,සංරචක ගුණාංග සහ යොමු කිරීම්,
 Additional Salary ,අමතර වැටුප,
-Condtion and formula,තත්වය සහ සූත්‍රය,
 Unmarked days,සලකුණු නොකළ දින,
 Absent Days,නොපැමිණෙන දින,
 Conditions and Formula variable and example,කොන්දේසි සහ සූත්‍ර විචල්‍යය සහ උදාහරණය,
@@ -9444,7 +9422,6 @@
 Please check your Plaid client ID and secret values,කරුණාකර ඔබේ ප්ලේඩ් ග්‍රාහක හැඳුනුම්පත සහ රහස් අගයන් පරීක්ෂා කරන්න,
 Bank transaction creation error,බැංකු ගනුදෙනු නිර්මාණය කිරීමේ දෝෂයකි,
 Unit of Measurement,මිනුම් ඒකකය,
-Row #{}: Selling rate for item {} is lower than its {}. Selling rate should be atleast {},පේළිය # {}: item item අයිතමය සඳහා විකුණුම් අනුපාතය එහි {than ට වඩා අඩුය. විකුණුම් අනුපාතය අවම වශයෙන් විය යුතුය}},
 Fiscal Year {0} Does Not Exist,මූල්‍ය වර්ෂය {0 Ex නොපවතී,
 Row # {0}: Returned Item {1} does not exist in {2} {3},පේළිය # {0}: ආපසු ලබා දුන් අයිතමය {1} {2} {3 in හි නොපවතී,
 Valuation type charges can not be marked as Inclusive,තක්සේරු වර්ගයේ ගාස්තු ඇතුළත් බව සලකුණු කළ නොහැක,
@@ -9598,8 +9575,60 @@
 Response Time for {0} priority in row {1} can't be greater than Resolution Time.,{1 row පේළියේ {0} ප්‍රමුඛතා සඳහා ප්‍රතිචාර කාලය විභේදන වේලාවට වඩා වැඩි විය නොහැක.,
 {0} is not enabled in {1},{0 in {1 in හි සක්‍රීය කර නැත,
 Group by Material Request,ද්‍රව්‍යමය ඉල්ලීම අනුව සමූහය,
-"Row {0}: For Supplier {0}, Email Address is Required to Send Email","පේළිය {0}: සැපයුම්කරු {0 For සඳහා, විද්‍යුත් තැපෑල යැවීමට ඊමේල් ලිපිනය අවශ්‍ය වේ",
 Email Sent to Supplier {0},සැපයුම්කරු වෙත විද්‍යුත් තැපෑල යවන ලදි {0},
 "The Access to Request for Quotation From Portal is Disabled. To Allow Access, Enable it in Portal Settings.","ද්වාරය වෙතින් මිල කැඳවීම සඳහා වන ප්‍රවේශය අක්‍රීය කර ඇත. ප්‍රවේශ වීමට ඉඩ දීමට, ද්වාර සැකසුම් තුළ එය සක්‍රීය කරන්න.",
 Supplier Quotation {0} Created,සැපයුම්කරු මිල ගණන් {0} නිර්මාණය කරන ලදි,
 Valid till Date cannot be before Transaction Date,ගනුදෙනු දිනයට පෙර දිනය වලංගු නොවේ,
+Unlink Advance Payment on Cancellation of Order,ඇණවුම අවලංගු කිරීම සඳහා අත්තිකාරම් ගෙවීම ඉවත් කරන්න,
+"Simple Python Expression, Example: territory != 'All Territories'","සරල පයිතන් ප්‍රකාශනය, උදාහරණය: භූමිය! = &#39;සියලුම ප්‍රදේශ&#39;",
+Sales Contributions and Incentives,විකුණුම් දායක මුදල් සහ දිරි දීමනා,
+Sourced by Supplier,සැපයුම්කරු විසිනි,
+Total weightage assigned should be 100%.<br>It is {0},පවරා ඇති මුළු බර 100% විය යුතුය.<br> එය {0 is වේ,
+Account {0} exists in parent company {1}.,මව් සමාගමෙහි {0 Account ගිණුම පවතී {1}.,
+"To overrule this, enable '{0}' in company {1}","මෙය අවලංගු කිරීමට, company 1 company සමාගම තුළ &#39;{0}&#39; සක්‍රීය කරන්න",
+Invalid condition expression,අවලංගු තත්ව ප්‍රකාශනය,
+Please Select a Company First,කරුණාකර පළමුව සමාගමක් තෝරන්න,
+Please Select Both Company and Party Type First,කරුණාකර පළමුව සමාගම සහ පක්ෂ වර්ගය තෝරන්න,
+Provide the invoice portion in percent,ඉන්වොයිස් කොටස ප්‍රතිශතයකින් ලබා දෙන්න,
+Give number of days according to prior selection,පෙර තේරීම අනුව දින ගණනක් දෙන්න,
+Email Details,විද්‍යුත් තැපැල් විස්තර,
+"Select a greeting for the receiver. E.g. Mr., Ms., etc.","ලබන්නාට සුබ පැතුම් තෝරන්න. උදා: මහත්මයා, මහත්මිය.",
+Preview Email,ඊ-තැපෑල පෙරදසුන් කරන්න,
+Please select a Supplier,කරුණාකර සැපයුම්කරුවෙකු තෝරන්න,
+Supplier Lead Time (days),සැපයුම්කරුගේ ඊයම් කාලය (දින),
+"Home, Work, etc.","නිවස, වැඩ ආදිය.",
+Exit Interview Held On,සම්මුඛ පරීක්ෂණයෙන් පිටවීම,
+Condition and formula,තත්වය සහ සූත්‍රය,
+Sets 'Target Warehouse' in each row of the Items table.,අයිතම වගුවේ එක් එක් පේළියේ &#39;ඉලක්කගත ගබඩාව&#39; සකසයි.,
+Sets 'Source Warehouse' in each row of the Items table.,අයිතම වගුවේ එක් එක් පේළියේ &#39;ප්‍රභව ගබඩාව&#39; සකසයි.,
+POS Register,POS ලේඛනය,
+"Can not filter based on POS Profile, if grouped by POS Profile",POS පැතිකඩ අනුව කාණ්ඩගත කර ඇත්නම් POS පැතිකඩ මත පදනම්ව පෙරහන් කළ නොහැක,
+"Can not filter based on Customer, if grouped by Customer",ගනුදෙනුකරු විසින් කාණ්ඩගත කර ඇත්නම් පාරිභෝගිකයා මත පදනම්ව පෙරහන් කළ නොහැක,
+"Can not filter based on Cashier, if grouped by Cashier","මුදල් අයකැමි විසින් කාණ්ඩගත කර ඇත්නම්, අයකැමි මත පදනම්ව පෙරහන් කළ නොහැක",
+Payment Method,ගෙවීමේ ක්රමය,
+"Can not filter based on Payment Method, if grouped by Payment Method",ගෙවීම් ක්‍රමය අනුව කාණ්ඩගත කර ඇත්නම් ගෙවීම් ක්‍රමය මත පදනම්ව පෙරහන් කළ නොහැක,
+Supplier Quotation Comparison,සැපයුම්කරු මිල ගණන් සංසන්දනය,
+Price per Unit (Stock UOM),ඒකකයකට මිල (කොටස් UOM),
+Group by Supplier,සැපයුම්කරු විසින් සමූහය,
+Group by Item,අයිතමය අනුව සමූහය,
+Remember to set {field_label}. It is required by {regulation}.,{Field_label set සැකසීමට මතක තබා ගන්න. එය අවශ්‍ය වන්නේ {නියාමනය by මගිනි.,
+Enrollment Date cannot be before the Start Date of the Academic Year {0},ඇතුළත් වීමේ දිනය අධ්‍යයන වර්ෂයේ ආරම්භක දිනයට පෙර විය නොහැක {0},
+Enrollment Date cannot be after the End Date of the Academic Term {0},බඳවා ගැනීමේ දිනය අධ්‍යයන වාරයේ අවසන් දිනට පසුව විය නොහැක {0},
+Enrollment Date cannot be before the Start Date of the Academic Term {0},ඇතුළත් වීමේ දිනය අධ්‍යයන වාරයේ ආරම්භක දිනයට පෙර විය නොහැක {0},
+Posting future transactions are not allowed due to Immutable Ledger,වෙනස් කළ නොහැකි ලෙජරය නිසා අනාගත ගනුදෙනු පළ කිරීමට අවසර නැත,
+Future Posting Not Allowed,අනාගත පළකිරීමට අවසර නැත,
+"To enable Capital Work in Progress Accounting, ",ප්‍රගති ගිණුම්කරණයේ ප්‍රාග්ධන වැඩ සක්‍රීය කිරීම සඳහා,
+you must select Capital Work in Progress Account in accounts table,ගිණුම් වගුවේ ප්‍රගති ගිණුමේ ප්‍රාග්ධන වැඩ තෝරාගත යුතුය,
+You can also set default CWIP account in Company {},සමාගම} in හි ඔබට සුපුරුදු CWIP ගිණුම සැකසිය හැකිය.,
+The Request for Quotation can be accessed by clicking on the following button,පහත දැක්වෙන බොත්තම ක්ලික් කිරීමෙන් මිල කැඳවීම සඳහා ඉල්ලීම ලබා ගත හැකිය,
+Regards,සුභ පැතුම්,
+Please click on the following button to set your new password,ඔබගේ නව මුරපදය සැකසීමට කරුණාකර පහත බොත්තම ක්ලික් කරන්න,
+Update Password,මුරපදය යාවත්කාලීන කරන්න,
+Row #{}: Selling rate for item {} is lower than its {}. Selling {} should be atleast {},පේළිය # {}: item item අයිතමය සඳහා විකුණුම් අනුපාතය එහි {than ට වඩා අඩුය. {} විකිණීම අවම වශයෙන් විය යුතුය}},
+You can alternatively disable selling price validation in {} to bypass this validation.,මෙම වලංගු කිරීම මඟ හැරීම සඳහා ඔබට විකල්ප වශයෙන් {in හි විකුණුම් මිල වලංගු කිරීම අක්‍රිය කළ හැකිය.,
+Invalid Selling Price,වලංගු නොවන විකුණුම් මිල,
+Address needs to be linked to a Company. Please add a row for Company in the Links table.,ලිපිනය සමාගමකට සම්බන්ධ කළ යුතුය. කරුණාකර සමාගම සඳහා පේළියක් සබැඳි වගුවේ එක් කරන්න.,
+Company Not Linked,සමාගම සම්බන්ධ නොවේ,
+Import Chart of Accounts from CSV / Excel files,CSV / Excel ලිපිගොනු වලින් ගිණුම් වගුව ආයාත කරන්න,
+Completed Qty cannot be greater than 'Qty to Manufacture',සම්පුර්ණ කරන ලද Qty &#39;නිෂ්පාදනය සඳහා Qty&#39; ට වඩා වැඩි විය නොහැක,
+"Row {0}: For Supplier {1}, Email Address is Required to send an email","පේළිය {0}: සැපයුම්කරු {1 For සඳහා, විද්‍යුත් තැපෑලක් යැවීමට විද්‍යුත් ලිපිනය අවශ්‍ය වේ",
diff --git a/erpnext/translations/sk.csv b/erpnext/translations/sk.csv
index d299a75..0eac638 100644
--- a/erpnext/translations/sk.csv
+++ b/erpnext/translations/sk.csv
@@ -521,7 +521,6 @@
 Chargeble,Chargeble,
 Charges are updated in Purchase Receipt against each item,Poplatky jsou aktualizovány v dokladu o koupi na každou položku,
 "Charges will be distributed proportionately based on item qty or amount, as per your selection","Poplatky budou rozděleny úměrně na základě položky Množství nebo částkou, dle Vašeho výběru",
-Chart Of Accounts,Účtovný rozvrh,
 Chart of Cost Centers,Diagram nákladových stredísk,
 Check all,Skontrolovať všetko,
 Checkout,Odhlásiť sa,
@@ -581,7 +580,6 @@
 Compensatory Off,Náhradné voľno,
 Compensatory leave request days not in valid holidays,Kompenzačné dni žiadosti o dovolenku nie sú v platných sviatkoch,
 Complaint,sťažnosť,
-Completed Qty can not be greater than 'Qty to Manufacture',"Dokončené množství nemůže být větší než ""Množství do výroby""",
 Completion Date,Dokončení Datum,
 Computer,Počítač,
 Condition,Podmienka,
@@ -2033,7 +2031,6 @@
 Please select Charge Type first,"Prosím, vyberte druh tarifu první",
 Please select Company,"Prosím, vyberte spoločnosť",
 Please select Company and Designation,Vyberte spoločnosť a označenie,
-Please select Company and Party Type first,Vyberte první společnost a Party Typ,
 Please select Company and Posting Date to getting entries,Zvoľte Spoločnosť a dátum odoslania na zadanie záznamov,
 Please select Company first,"Prosím, vyberte najprv firmu",
 Please select Completion Date for Completed Asset Maintenance Log,Vyberte dátum dokončenia pre dokončený protokol údržby majetku,
@@ -2980,7 +2977,6 @@
 The name of your company for which you are setting up this system.,"Názov spoločnosti, pre ktorú nastavujete tento systém",
 The number of shares and the share numbers are inconsistent,Počet akcií a čísla akcií je nekonzistentný,
 The payment gateway account in plan {0} is different from the payment gateway account in this payment request,Účet platobnej brány v pláne {0} sa líši od účtu platobnej brány v tejto žiadosti o platbu,
-The request for quotation can be accessed by clicking on the following link,Žiadosť o cenovú ponuku je možné pristupovať kliknutím na nasledujúci odkaz,
 The selected BOMs are not for the same item,Vybrané kusovníky nie sú rovnaké položky,
 The selected item cannot have Batch,Vybraná položka nemôže mať dávku,
 The seller and the buyer cannot be the same,Predávajúci a kupujúci nemôžu byť rovnakí,
@@ -3130,7 +3126,6 @@
 Total flexible benefit component amount {0} should not be less than max benefits {1},Celková flexibilná čiastka dávky {0} by nemala byť nižšia ako maximálna dávka {1},
 Total hours: {0},Celkom hodín: {0},
 Total leaves allocated is mandatory for Leave Type {0},Celkový počet priradených listov je povinný pre typ dovolenky {0},
-Total weightage assigned should be 100%. It is {0},Celková weightage přiřazen by měla být 100%. Je {0},
 Total working hours should not be greater than max working hours {0},Celkom pracovná doba by nemala byť väčšia ako maximálna pracovnej doby {0},
 Total {0} ({1}),Celkom {0} ({1}),
 "Total {0} for all items is zero, may be you should change 'Distribute Charges Based On'","Total {0} u všetkých položiek je nulová, môže byť by ste mali zmeniť, Distribuovať poplatkov na základe &#39;",
@@ -3544,7 +3539,6 @@
 Company field is required,Pole spoločnosti je povinné,
 Creating Dimensions...,Vytvára sa dimenzia ...,
 Duplicate entry against the item code {0} and manufacturer {1},Duplikát oproti kódu položky {0} a výrobcovi {1},
-Import Chart Of Accounts from CSV / Excel files,Importujte účtovnú schému zo súborov CSV / Excel,
 Invalid GSTIN! The input you've entered doesn't match the GSTIN format for UIN Holders or Non-Resident OIDAR Service Providers,Neplatné GSTIN! Zadaný vstup sa nezhoduje s formátom GSTIN pre držiteľov UIN alebo nerezidentných poskytovateľov služieb OIDAR,
 Invoice Grand Total,Celková faktúra,
 Last carbon check date cannot be a future date,Posledný dátum kontroly uhlíkom nemôže byť budúcim dátumom,
@@ -3921,7 +3915,6 @@
 Plaid public token error,Plaid public token error,
 Plaid transactions sync error,Chyba synchronizácie prehľadných transakcií,
 Please check the error log for details about the import errors,Podrobnosti o chybách importu nájdete v protokole chýb,
-Please click on the following link to set your new password,"Prosím klikněte na následující odkaz, pro nastavení nového hesla",
 Please create <b>DATEV Settings</b> for Company <b>{}</b>.,Vytvorte <b>nastavenia</b> spoločnosti <b>DATEV</b> pre spoločnosť <b>{}</b> .,
 Please create adjustment Journal Entry for amount {0} ,Vytvorte opravný zápis do denníka pre sumu {0},
 Please do not create more than 500 items at a time,Nevytvárajte naraz viac ako 500 položiek,
@@ -3997,6 +3990,7 @@
 Release date must be in the future,Dátum vydania musí byť v budúcnosti,
 Relieving Date must be greater than or equal to Date of Joining,Dátum vydania musí byť väčší alebo rovný dátumu pripojenia,
 Rename,Premenovať,
+Rename Not Allowed,Premenovať nie je povolené,
 Repayment Method is mandatory for term loans,Spôsob splácania je povinný pre termínované pôžičky,
 Repayment Start Date is mandatory for term loans,Dátum začiatku splácania je povinný pre termínované pôžičky,
 Report Item,Položka správy,
@@ -4043,7 +4037,6 @@
 Select All,Označiť všetko,
 Select Difference Account,Vyberte rozdielny účet,
 Select a Default Priority.,Vyberte predvolenú prioritu.,
-Select a Supplier from the Default Supplier List of the items below.,Vyberte dodávateľa z Predvoleného zoznamu dodávateľov z nižšie uvedených položiek.,
 Select a company,Vyberte spoločnosť,
 Select finance book for the item {0} at row {1},Vyberte finančnú knihu pre položku {0} v riadku {1},
 Select only one Priority as Default.,Ako predvolenú vyberte iba jednu prioritu.,
@@ -4247,7 +4240,6 @@
 Actual ,Aktuální,
 Add to cart,Pridať do košíka,
 Budget,rozpočet,
-Chart Of Accounts Importer,Dovozca účtovej osnovy,
 Chart of Accounts,Účtová osnova,
 Customer database.,Databáza zákazníkov.,
 Days Since Last order,Počet dnů od poslední objednávky,
@@ -4546,7 +4538,6 @@
 Check Supplier Invoice Number Uniqueness,"Skontrolujte, či dodávateľské faktúry Počet Jedinečnosť",
 Make Payment via Journal Entry,Vykonať platbu cez Journal Entry,
 Unlink Payment on Cancellation of Invoice,Odpojiť Platba o zrušení faktúry,
-Unlink Advance Payment on Cancelation of Order,Odpojte zálohovú platbu pri zrušení objednávky,
 Book Asset Depreciation Entry Automatically,Automatické odpisovanie majetku v účtovnej závierke,
 Automatically Add Taxes and Charges from Item Tax Template,Automaticky pridávať dane a poplatky zo šablóny dane z položiek,
 Automatically Fetch Payment Terms,Automaticky načítať platobné podmienky,
@@ -4940,7 +4931,6 @@
 POS Customer Group,POS Customer Group,
 POS Field,Pole POS,
 POS Item Group,POS položky Group,
-[Select],[Vybrať],
 Company Address,Adresa spoločnosti,
 Update Stock,Aktualizace skladem,
 Ignore Pricing Rule,Ignorovat Ceny pravidlo,
@@ -6481,7 +6471,6 @@
 Appraisal Template,Posouzení Template,
 For Employee Name,Pro jméno zaměstnance,
 Goals,Ciele,
-Calculate Total Score,Vypočítať celkové skóre,
 Total Score (Out of 5),Celkové skóre (Out of 5),
 "Any other remarks, noteworthy effort that should go in the records.","Akékoľvek iné poznámky, pozoruhodné úsilie, ktoré by mali ísť v záznamoch.",
 Appraisal Goal,Posouzení Goal,
@@ -6599,11 +6588,6 @@
 Reason for Leaving,Dôvod priepustky,
 Leave Encashed?,Ponechte zpeněžení?,
 Encashment Date,Inkaso Datum,
-Exit Interview Details,Exit Rozhovor Podrobnosti,
-Held On,Které se konalo dne,
-Reason for Resignation,Dôvod rezignácie,
-Better Prospects,Lepší vyhlídky,
-Health Concerns,Zdravotní Obavy,
 New Workplace,Nové pracovisko,
 HR-EAD-.YYYY.-,HR-EAD-.YYYY.-,
 Returned Amount,Vrátená suma,
@@ -8239,9 +8223,6 @@
 Manufacturers used in Items,Výrobcovia používané v bodoch,
 Limited to 12 characters,Obmedzené na 12 znakov,
 MAT-MR-.YYYY.-,MAT-MR-.YYYY.-,
-Set Warehouse,Nastaviť sklad,
-Sets 'For Warehouse' in each row of the Items table.,Nastavuje možnosť „Na sklad“ v každom riadku tabuľky Položky.,
-Requested For,Požadovaných pro,
 Partially Ordered,Čiastočne objednané,
 Transferred,prevedená,
 % Ordered,% Objednané,
@@ -8690,8 +8671,6 @@
 Select warehouse for material requests,Vyberte sklad pre požiadavky na materiál,
 Transfer Materials For Warehouse {0},Prenos materiálov do skladu {0},
 Production Plan Material Request Warehouse,Sklad požiadaviek na materiál výrobného plánu,
-Set From Warehouse,Nastavené zo skladu,
-Source Warehouse (Material Transfer),Zdrojový sklad (prenos materiálu),
 Sets 'Source Warehouse' in each row of the items table.,Nastavuje „Zdrojový sklad“ v každom riadku tabuľky položiek.,
 Sets 'Target Warehouse' in each row of the items table.,Nastavuje „Cieľový sklad“ v každom riadku tabuľky položiek.,
 Show Cancelled Entries,Zobraziť zrušené záznamy,
@@ -9157,7 +9136,6 @@
 Is Income Tax Component,Je zložkou dane z príjmu,
 Component properties and references ,Vlastnosti komponentov a odkazy,
 Additional Salary ,Dodatočný plat,
-Condtion and formula,Podmienka a vzorec,
 Unmarked days,Neoznačené dni,
 Absent Days,Neprítomné dni,
 Conditions and Formula variable and example,Premenná podmienok a príkladu a vzorec,
@@ -9444,7 +9422,6 @@
 Please check your Plaid client ID and secret values,Skontrolujte svoje ID klienta a tajné hodnoty,
 Bank transaction creation error,Chyba pri vytváraní bankových transakcií,
 Unit of Measurement,Jednotka merania,
-Row #{}: Selling rate for item {} is lower than its {}. Selling rate should be atleast {},Riadok č. {}: Miera predaja položky {} je nižšia ako hodnota {}. Miera predaja by mala byť minimálne {},
 Fiscal Year {0} Does Not Exist,Fiškálny rok {0} neexistuje,
 Row # {0}: Returned Item {1} does not exist in {2} {3},Riadok č. {0}: Vrátená položka {1} neexistuje v doméne {2} {3},
 Valuation type charges can not be marked as Inclusive,Poplatky typu ocenenia nemožno označiť ako inkluzívne,
@@ -9598,8 +9575,60 @@
 Response Time for {0} priority in row {1} can't be greater than Resolution Time.,Čas odozvy pre {0} prioritu v riadku {1} nemôže byť väčší ako Čas rozlíšenia.,
 {0} is not enabled in {1},Aplikácia {0} nie je povolená v doméne {1},
 Group by Material Request,Zoskupiť podľa žiadosti o materiál,
-"Row {0}: For Supplier {0}, Email Address is Required to Send Email",Riadok {0}: Pre dodávateľa {0} je na odosielanie e-mailových správ vyžadovaná e-mailová adresa,
 Email Sent to Supplier {0},E-mail odoslaný dodávateľovi {0},
 "The Access to Request for Quotation From Portal is Disabled. To Allow Access, Enable it in Portal Settings.","Prístup k žiadosti o cenovú ponuku z portálu je zakázaný. Ak chcete povoliť prístup, povoľte ho v nastaveniach portálu.",
 Supplier Quotation {0} Created,Cenová ponuka dodávateľa {0} bola vytvorená,
 Valid till Date cannot be before Transaction Date,Platné do dátumu nemôže byť skôr ako dátum transakcie,
+Unlink Advance Payment on Cancellation of Order,Zrušenie prepojenia zálohy pri zrušení objednávky,
+"Simple Python Expression, Example: territory != 'All Territories'","Jednoduchý výraz v jazyku Python, príklad: Teritorium! = &#39;Všetky územia&#39;",
+Sales Contributions and Incentives,Príspevky k predaju a stimuly,
+Sourced by Supplier,Zabezpečené dodávateľom,
+Total weightage assigned should be 100%.<br>It is {0},Celková pridelená hmotnosť by mala byť 100%.<br> Je to {0},
+Account {0} exists in parent company {1}.,Účet {0} existuje v materskej spoločnosti {1}.,
+"To overrule this, enable '{0}' in company {1}","Ak to chcete prekonať, povoľte „{0}“ v spoločnosti {1}",
+Invalid condition expression,Neplatný výraz podmienky,
+Please Select a Company First,Najskôr vyberte spoločnosť,
+Please Select Both Company and Party Type First,Najskôr vyberte spoločnosť a typ strany,
+Provide the invoice portion in percent,Poskytnite časť faktúry v percentách,
+Give number of days according to prior selection,Uveďte počet dní podľa predchádzajúceho výberu,
+Email Details,E-mailové podrobnosti,
+"Select a greeting for the receiver. E.g. Mr., Ms., etc.","Vyberte pozdrav pre príjemcu. Napr. Pán, pani atď.",
+Preview Email,Zobraziť ukážku e-mailu,
+Please select a Supplier,Vyberte dodávateľa,
+Supplier Lead Time (days),Dodací čas dodávateľa (dni),
+"Home, Work, etc.","Domov, Práca atď.",
+Exit Interview Held On,Ukončený pohovor,
+Condition and formula,Podmienka a vzorec,
+Sets 'Target Warehouse' in each row of the Items table.,Nastavuje „Cieľový sklad“ v každom riadku tabuľky Položky.,
+Sets 'Source Warehouse' in each row of the Items table.,Nastavuje „Zdrojový sklad“ v každom riadku tabuľky Položky.,
+POS Register,POS register,
+"Can not filter based on POS Profile, if grouped by POS Profile","Nie je možné filtrovať na základe POS profilu, ak je zoskupený podľa POS profilu",
+"Can not filter based on Customer, if grouped by Customer","Nie je možné filtrovať na základe zákazníka, ak je zoskupený podľa zákazníka",
+"Can not filter based on Cashier, if grouped by Cashier","Nie je možné filtrovať na základe pokladne, ak je zoskupená podľa pokladníka",
+Payment Method,Spôsob platby,
+"Can not filter based on Payment Method, if grouped by Payment Method","Nie je možné filtrovať na základe spôsobu platby, ak je zoskupený podľa spôsobu platby",
+Supplier Quotation Comparison,Porovnanie ponúk dodávateľa,
+Price per Unit (Stock UOM),Cena za jednotku (skladové množstvo),
+Group by Supplier,Zoskupiť podľa dodávateľa,
+Group by Item,Zoskupiť podľa položky,
+Remember to set {field_label}. It is required by {regulation}.,Nezabudnite nastaviť {field_label}. Vyžaduje sa {nariadením}.,
+Enrollment Date cannot be before the Start Date of the Academic Year {0},Dátum registrácie nemôže byť skôr ako dátum začatia akademického roka {0},
+Enrollment Date cannot be after the End Date of the Academic Term {0},Dátum registrácie nemôže byť po dátume ukončenia akademického obdobia {0},
+Enrollment Date cannot be before the Start Date of the Academic Term {0},Dátum registrácie nemôže byť skôr ako dátum začiatku akademického obdobia {0},
+Posting future transactions are not allowed due to Immutable Ledger,Zúčtovanie budúcich transakcií nie je povolené z dôvodu Immutable Ledger,
+Future Posting Not Allowed,Budúce zverejňovanie nie je povolené,
+"To enable Capital Work in Progress Accounting, ","Ak chcete povoliť postupné účtovanie kapitálu,",
+you must select Capital Work in Progress Account in accounts table,v tabuľke účtov musíte vybrať Účet rozpracovaného kapitálu,
+You can also set default CWIP account in Company {},Môžete tiež nastaviť predvolený účet CWIP v spoločnosti {},
+The Request for Quotation can be accessed by clicking on the following button,K žiadosti o cenovú ponuku sa dostanete kliknutím na nasledujúce tlačidlo,
+Regards,S pozdravom,
+Please click on the following button to set your new password,Kliknutím na nasledujúce tlačidlo nastavíte svoje nové heslo,
+Update Password,Aktualizujte heslo,
+Row #{}: Selling rate for item {} is lower than its {}. Selling {} should be atleast {},Riadok č. {}: Miera predaja položky {} je nižšia ako hodnota {}. Predaj {} by mal byť minimálne {},
+You can alternatively disable selling price validation in {} to bypass this validation.,"Alternatívne môžete deaktivovať overenie predajnej ceny v {}, aby ste obišli toto overenie.",
+Invalid Selling Price,Neplatná predajná cena,
+Address needs to be linked to a Company. Please add a row for Company in the Links table.,Adresa musí byť prepojená so spoločnosťou. V tabuľke odkazov pridajte riadok pre spoločnosť.,
+Company Not Linked,Spoločnosť neprepojená,
+Import Chart of Accounts from CSV / Excel files,Importujte účtovnú osnovu zo súborov CSV / Excel,
+Completed Qty cannot be greater than 'Qty to Manufacture',Vyplnené množstvo nemôže byť väčšie ako „Množstvo do výroby“,
+"Row {0}: For Supplier {1}, Email Address is Required to send an email",Riadok {0}: Pre dodávateľa {1} je na odoslanie e-mailu vyžadovaná e-mailová adresa,
diff --git a/erpnext/translations/sl.csv b/erpnext/translations/sl.csv
index ab99eb5..b2732fa 100644
--- a/erpnext/translations/sl.csv
+++ b/erpnext/translations/sl.csv
@@ -521,7 +521,6 @@
 Chargeble,Polnilna,
 Charges are updated in Purchase Receipt against each item,Dajatve so posodobljeni v Potrdilo o nakupu ob vsaki postavki,
 "Charges will be distributed proportionately based on item qty or amount, as per your selection","Dajatve bodo razdeljeni sorazmerno na podlagi postavka Kol ali znesek, glede na vašo izbiro",
-Chart Of Accounts,Kontni načrt,
 Chart of Cost Centers,Grafikon stroškovnih mest,
 Check all,Preveri vse,
 Checkout,Naročilo,
@@ -581,7 +580,6 @@
 Compensatory Off,Kompenzacijske Off,
 Compensatory leave request days not in valid holidays,Zahtevki za nadomestni dopust ne veljajo v veljavnih praznikih,
 Complaint,Pritožba,
-Completed Qty can not be greater than 'Qty to Manufacture',Dopolnil Količina ne sme biti večja od &quot;Kol za Izdelava&quot;,
 Completion Date,datum dokončanja,
 Computer,Računalnik,
 Condition,Pogoj,
@@ -2033,7 +2031,6 @@
 Please select Charge Type first,"Prosimo, izberite Charge Vrsta najprej",
 Please select Company,"Prosimo, izberite Company",
 Please select Company and Designation,Izberite podjetje in določitev,
-Please select Company and Party Type first,Izberite podjetja in Zabava Vrsta najprej,
 Please select Company and Posting Date to getting entries,"Prosimo, izberite Podjetje in Datum objave, da vnesete vnose",
 Please select Company first,"Prosimo, izberite Company najprej",
 Please select Completion Date for Completed Asset Maintenance Log,"Prosimo, izberite Datum zaključka za zaključen dnevnik vzdrževanja sredstev",
@@ -2980,7 +2977,6 @@
 The name of your company for which you are setting up this system.,"Ime vašega podjetja, za katero ste vzpostavitvijo tega sistema.",
 The number of shares and the share numbers are inconsistent,Število delnic in številke delnic so neskladne,
 The payment gateway account in plan {0} is different from the payment gateway account in this payment request,Račun plačilnega prehoda v načrtu {0} se razlikuje od računa prehoda plačila v tej zahtevi za plačilo,
-The request for quotation can be accessed by clicking on the following link,Zahteva za ponudbo lahko dostopate s klikom na spodnjo povezavo,
 The selected BOMs are not for the same item,Izbrani BOMs niso na isti točki,
 The selected item cannot have Batch,Izbrana postavka ne more imeti Batch,
 The seller and the buyer cannot be the same,Prodajalec in kupec ne moreta biti isti,
@@ -3130,7 +3126,6 @@
 Total flexible benefit component amount {0} should not be less than max benefits {1},Skupni znesek komponente prožne ugodnosti {0} ne sme biti manjši od najvišjih ugodnosti {1},
 Total hours: {0},Skupno število ur: {0},
 Total leaves allocated is mandatory for Leave Type {0},Skupni dodeljeni listi so obvezni za tip zapustitve {0},
-Total weightage assigned should be 100%. It is {0},Skupaj weightage dodeljena mora biti 100%. To je {0},
 Total working hours should not be greater than max working hours {0},Skupaj delovni čas ne sme biti večja od max delovnih ur {0},
 Total {0} ({1}),Skupno {0} ({1}),
 "Total {0} for all items is zero, may be you should change 'Distribute Charges Based On'","Skupno {0} za vse postavke je nič, morda bi morali spremeniti &quot;Razdeli stroškov na osnovi&quot;",
@@ -3544,7 +3539,6 @@
 Company field is required,Polje podjetja je obvezno,
 Creating Dimensions...,Ustvarjanje dimenzij ...,
 Duplicate entry against the item code {0} and manufacturer {1},Podvojen vnos s kodo izdelka {0} in proizvajalcem {1},
-Import Chart Of Accounts from CSV / Excel files,Uvoz računov iz datotek CSV / Excel,
 Invalid GSTIN! The input you've entered doesn't match the GSTIN format for UIN Holders or Non-Resident OIDAR Service Providers,Neveljaven GSTIN! Vneseni vnos ne ustreza formatu GSTIN za imetnike UIN ali nerezidentne ponudnike storitev OIDAR,
 Invoice Grand Total,Račun za skupni znesek,
 Last carbon check date cannot be a future date,Zadnji datum preverjanja emisij ogljika ne more biti prihodnji datum,
@@ -3921,7 +3915,6 @@
 Plaid public token error,Napaka v javnem žetonu,
 Plaid transactions sync error,Napaka sinhronizacije transakcij v plaidu,
 Please check the error log for details about the import errors,Preverite dnevnik napak za podrobnosti o napakah pri uvozu,
-Please click on the following link to set your new password,"Prosimo, kliknite na spodnjo povezavo, da nastavite novo geslo",
 Please create <b>DATEV Settings</b> for Company <b>{}</b>.,Ustvarite <b>nastavitve DATEV</b> za podjetje <b>{}</b> .,
 Please create adjustment Journal Entry for amount {0} ,Ustvarite prilagoditev Vnos dnevnika za znesek {0},
 Please do not create more than 500 items at a time,Ne ustvarite več kot 500 elementov hkrati,
@@ -3997,6 +3990,7 @@
 Release date must be in the future,Datum izdaje mora biti v prihodnosti,
 Relieving Date must be greater than or equal to Date of Joining,Datum razrešitve mora biti večji ali enak datumu pridružitve,
 Rename,Preimenovanje,
+Rename Not Allowed,Preimenovanje ni dovoljeno,
 Repayment Method is mandatory for term loans,Način vračila je obvezen za posojila,
 Repayment Start Date is mandatory for term loans,Datum začetka poplačila je obvezen za posojila,
 Report Item,Postavka poročila,
@@ -4043,7 +4037,6 @@
 Select All,Izberi vse,
 Select Difference Account,Izberite račun za razlike,
 Select a Default Priority.,Izberite privzeto prioriteto.,
-Select a Supplier from the Default Supplier List of the items below.,Izberite dobavitelja s privzetega seznama dobaviteljev spodaj.,
 Select a company,Izberite podjetje,
 Select finance book for the item {0} at row {1},Izberite knjigo financ za postavko {0} v vrstici {1},
 Select only one Priority as Default.,Za privzeto izberite samo eno prednostno nalogo.,
@@ -4247,7 +4240,6 @@
 Actual ,Actual,
 Add to cart,Dodaj v voziček,
 Budget,Proračun,
-Chart Of Accounts Importer,Kazalnik računov Uvoznik,
 Chart of Accounts,Kontni načrt,
 Customer database.,Podatkovna baza strank.,
 Days Since Last order,Dni od zadnjega naročila,
@@ -4546,7 +4538,6 @@
 Check Supplier Invoice Number Uniqueness,Preverite Dobavitelj Številka računa Edinstvenost,
 Make Payment via Journal Entry,Naredite plačilo preko Journal Entry,
 Unlink Payment on Cancellation of Invoice,Prekinitev povezave med Plačilo na Izbris računa,
-Unlink Advance Payment on Cancelation of Order,Prekličite predplačilo ob preklicu naročila,
 Book Asset Depreciation Entry Automatically,Knjiga sredstev Amortizacija Začetek samodejno,
 Automatically Add Taxes and Charges from Item Tax Template,Samodejno dodajte davke in dajatve iz predloge za davek na postavke,
 Automatically Fetch Payment Terms,Samodejno prejmite plačilne pogoje,
@@ -4940,7 +4931,6 @@
 POS Customer Group,POS Group stranke,
 POS Field,POS polje,
 POS Item Group,POS Element Group,
-[Select],[Izberite],
 Company Address,Naslov podjetja,
 Update Stock,Posodobi zalogo,
 Ignore Pricing Rule,Ignoriraj pravilo Cenitve,
@@ -6481,7 +6471,6 @@
 Appraisal Template,Cenitev Predloga,
 For Employee Name,Za imena zaposlenih,
 Goals,Cilji,
-Calculate Total Score,Izračunaj skupni rezultat,
 Total Score (Out of 5),Skupna ocena (od 5),
 "Any other remarks, noteworthy effort that should go in the records.","Kakršne koli druge pripombe, omembe vredna napora, da bi moral iti v evidencah.",
 Appraisal Goal,Cenitev cilj,
@@ -6599,11 +6588,6 @@
 Reason for Leaving,Razlog za odhod,
 Leave Encashed?,Dopusta unovčijo?,
 Encashment Date,Vnovčevanje Datum,
-Exit Interview Details,Exit Intervju Podrobnosti,
-Held On,Datum,
-Reason for Resignation,Razlog za odstop,
-Better Prospects,Boljši obeti,
-Health Concerns,Zdravje,
 New Workplace,Novo delovno mesto,
 HR-EAD-.YYYY.-,HR-EAD-.LLLL.-,
 Returned Amount,Vrnjeni znesek,
@@ -8239,9 +8223,6 @@
 Manufacturers used in Items,"Proizvajalci, ki se uporabljajo v postavkah",
 Limited to 12 characters,Omejena na 12 znakov,
 MAT-MR-.YYYY.-,MAT-MR-.YYYY.-,
-Set Warehouse,Set Warehouse,
-Sets 'For Warehouse' in each row of the Items table.,V vsaki vrstici tabele Predmeti nastavi »Za skladišče«.,
-Requested For,Zaprosila za,
 Partially Ordered,Delno naročeno,
 Transferred,Preneseni,
 % Ordered,% Naročeno,
@@ -8690,8 +8671,6 @@
 Select warehouse for material requests,Izberite skladišče za zahteve po materialu,
 Transfer Materials For Warehouse {0},Prenos materiala za skladišče {0},
 Production Plan Material Request Warehouse,Skladišče zahtev za material načrta proizvodnje,
-Set From Warehouse,Set iz skladišča,
-Source Warehouse (Material Transfer),Izvorno skladišče (prenos materiala),
 Sets 'Source Warehouse' in each row of the items table.,Nastavi &#39;Izvorno skladišče&#39; v vsaki vrstici tabele elementov.,
 Sets 'Target Warehouse' in each row of the items table.,V vsako vrstico tabele postavk nastavi »Target Warehouse«.,
 Show Cancelled Entries,Prikaži preklicane vnose,
@@ -9157,7 +9136,6 @@
 Is Income Tax Component,Je sestavina davka na dohodek,
 Component properties and references ,Lastnosti komponent in reference,
 Additional Salary ,Dodatna plača,
-Condtion and formula,Stanje in formula,
 Unmarked days,Neoznačeni dnevi,
 Absent Days,Odsotni dnevi,
 Conditions and Formula variable and example,Pogoji in spremenljivka formule in primer,
@@ -9444,7 +9422,6 @@
 Please check your Plaid client ID and secret values,"Prosimo, preverite svoj ID odjemalca Plaid in tajne vrednosti",
 Bank transaction creation error,Napaka pri ustvarjanju bančne transakcije,
 Unit of Measurement,Merska enota,
-Row #{}: Selling rate for item {} is lower than its {}. Selling rate should be atleast {},Vrstica št. {}: Stopnja prodaje izdelka {} je nižja od vrednosti {}. Stopnja prodaje mora biti najmanj {},
 Fiscal Year {0} Does Not Exist,Proračunsko leto {0} ne obstaja,
 Row # {0}: Returned Item {1} does not exist in {2} {3},Vrstica št. {0}: Vrnjeni izdelek {1} ne obstaja v {2} {3},
 Valuation type charges can not be marked as Inclusive,Stroškov vrste vrednotenja ni mogoče označiti kot Vključno,
@@ -9598,8 +9575,60 @@
 Response Time for {0} priority in row {1} can't be greater than Resolution Time.,Odzivni čas za {0} prednost v vrstici {1} ne sme biti daljši od časa ločljivosti.,
 {0} is not enabled in {1},{0} ni omogočen v {1},
 Group by Material Request,Razvrsti po zahtevi za material,
-"Row {0}: For Supplier {0}, Email Address is Required to Send Email",Vrstica {0}: Za dobavitelja {0} je za pošiljanje e-pošte potreben e-poštni naslov,
 Email Sent to Supplier {0},E-poštno sporočilo poslano dobavitelju {0},
 "The Access to Request for Quotation From Portal is Disabled. To Allow Access, Enable it in Portal Settings.","Dostop do zahteve za ponudbo s portala je onemogočen. Če želite dovoliti dostop, ga omogočite v nastavitvah portala.",
 Supplier Quotation {0} Created,Navedba ponudnika {0} Ustvarjena,
 Valid till Date cannot be before Transaction Date,"Velja do datuma, ne sme biti pred datumom transakcije",
+Unlink Advance Payment on Cancellation of Order,Preklic predplačila ob preklicu naročila,
+"Simple Python Expression, Example: territory != 'All Territories'","Preprost izraz Python, primer: teritorij! = &#39;Vsa ozemlja&#39;",
+Sales Contributions and Incentives,Prispevki in spodbude za prodajo,
+Sourced by Supplier,Vir: Dobavitelj,
+Total weightage assigned should be 100%.<br>It is {0},Skupna dodeljena utež mora biti 100%.<br> Je {0},
+Account {0} exists in parent company {1}.,Račun {0} obstaja v nadrejeni družbi {1}.,
+"To overrule this, enable '{0}' in company {1}","Če želite to preglasiti, omogočite »{0}« v podjetju {1}",
+Invalid condition expression,Neveljaven izraz pogoja,
+Please Select a Company First,Najprej izberite podjetje,
+Please Select Both Company and Party Type First,Najprej izberite vrsto podjetja in stranke,
+Provide the invoice portion in percent,Navedite del računa v odstotkih,
+Give number of days according to prior selection,Navedite število dni glede na predhodno izbiro,
+Email Details,Podrobnosti o e-pošti,
+"Select a greeting for the receiver. E.g. Mr., Ms., etc.","Izberite pozdrav za sprejemnika. Npr. Gospod, gospa itd.",
+Preview Email,Predogled e-pošte,
+Please select a Supplier,"Prosimo, izberite dobavitelja",
+Supplier Lead Time (days),Čas dobave dobavitelja (dnevi),
+"Home, Work, etc.","Dom, služba itd.",
+Exit Interview Held On,Izhodni intervju je potekal,
+Condition and formula,Pogoj in formula,
+Sets 'Target Warehouse' in each row of the Items table.,Nastavi &#39;Target Warehouse&#39; v vsaki vrstici tabele Predmeti.,
+Sets 'Source Warehouse' in each row of the Items table.,Nastavi &#39;Izvorno skladišče&#39; v vsaki vrstici tabele Predmeti.,
+POS Register,POS register,
+"Can not filter based on POS Profile, if grouped by POS Profile","Ni mogoče filtrirati na podlagi POS profila, če je združeno po POS profilu",
+"Can not filter based on Customer, if grouped by Customer","Ni mogoče filtrirati glede na stranko, če jo razvrsti stranka",
+"Can not filter based on Cashier, if grouped by Cashier","Ni mogoče filtrirati na podlagi blagajne, če jo razvrsti po blagajni",
+Payment Method,Način plačila,
+"Can not filter based on Payment Method, if grouped by Payment Method","Ni mogoče filtrirati glede na način plačila, če je razvrščen po načinu plačila",
+Supplier Quotation Comparison,Primerjava ponudb,
+Price per Unit (Stock UOM),Cena na enoto (zaloga UOM),
+Group by Supplier,Skupina po dobaviteljih,
+Group by Item,Razvrsti po postavkah,
+Remember to set {field_label}. It is required by {regulation}.,Ne pozabite nastaviti {field_label}. Zahteva {uredba}.,
+Enrollment Date cannot be before the Start Date of the Academic Year {0},Datum vpisa ne sme biti pred začetkom študijskega leta {0},
+Enrollment Date cannot be after the End Date of the Academic Term {0},Datum vpisa ne sme biti po končnem datumu študijskega obdobja {0},
+Enrollment Date cannot be before the Start Date of the Academic Term {0},Datum vpisa ne sme biti pred začetnim datumom študijskega obdobja {0},
+Posting future transactions are not allowed due to Immutable Ledger,Knjiženje prihodnjih transakcij zaradi nespremenljive knjige ni dovoljeno,
+Future Posting Not Allowed,Objavljanje v prihodnosti ni dovoljeno,
+"To enable Capital Work in Progress Accounting, ","Če želite omogočiti računovodstvo kapitalskega dela v teku,",
+you must select Capital Work in Progress Account in accounts table,v tabeli računov morate izbrati račun Capital Work in Progress,
+You can also set default CWIP account in Company {},Privzeti račun CWIP lahko nastavite tudi v podjetju {},
+The Request for Quotation can be accessed by clicking on the following button,Do zahteve za ponudbo lahko dostopate s klikom na naslednji gumb,
+Regards,S spoštovanjem,
+Please click on the following button to set your new password,Za nastavitev novega gesla kliknite naslednji gumb,
+Update Password,Posodobi geslo,
+Row #{}: Selling rate for item {} is lower than its {}. Selling {} should be atleast {},Vrstica št. {}: Stopnja prodaje izdelka {} je nižja od vrednosti {}. Prodaja {} mora biti vsaj {},
+You can alternatively disable selling price validation in {} to bypass this validation.,"Lahko tudi onemogočite preverjanje prodajne cene v {}, da to preverjanje zaobidete.",
+Invalid Selling Price,Neveljavna prodajna cena,
+Address needs to be linked to a Company. Please add a row for Company in the Links table.,Naslov mora biti povezan s podjetjem. V tabelo Povezave dodajte vrstico za podjetje.,
+Company Not Linked,Podjetje ni povezano,
+Import Chart of Accounts from CSV / Excel files,Uvozite kontni načrt iz datotek CSV / Excel,
+Completed Qty cannot be greater than 'Qty to Manufacture',Dokončana količina ne sme biti večja od „Količina za izdelavo“,
+"Row {0}: For Supplier {1}, Email Address is Required to send an email",Vrstica {0}: Za dobavitelja {1} je za pošiljanje e-pošte potreben e-poštni naslov,
diff --git a/erpnext/translations/sq.csv b/erpnext/translations/sq.csv
index cc61bcb..32e314f 100644
--- a/erpnext/translations/sq.csv
+++ b/erpnext/translations/sq.csv
@@ -521,7 +521,6 @@
 Chargeble,Chargeble,
 Charges are updated in Purchase Receipt against each item,Akuzat janë përditësuar në pranimin Blerje kundër çdo send,
 "Charges will be distributed proportionately based on item qty or amount, as per your selection","Akuzat do të shpërndahen në mënyrë proporcionale në bazë të Qty pika ose sasi, si për zgjedhjen tuaj",
-Chart Of Accounts,Lista e Llogarive,
 Chart of Cost Centers,Grafiku i Qendrave te Kostos,
 Check all,kontrollo të gjitha,
 Checkout,arkë,
@@ -581,7 +580,6 @@
 Compensatory Off,Kompensues Off,
 Compensatory leave request days not in valid holidays,Ditët e kompensimit të pushimit nuk janë në pushime të vlefshme,
 Complaint,ankim,
-Completed Qty can not be greater than 'Qty to Manufacture',Kompletuar Qty nuk mund të jetë më i madh se &quot;Qty për Prodhimi&quot;,
 Completion Date,Data e përfundimit,
 Computer,kompjuter,
 Condition,Kusht,
@@ -2033,7 +2031,6 @@
 Please select Charge Type first,"Ju lutem, përzgjidhni Ngarkesa Lloji i parë",
 Please select Company,"Ju lutem, përzgjidhni Company",
 Please select Company and Designation,Ju lutemi zgjidhni Kompania dhe Caktimi,
-Please select Company and Party Type first,"Ju lutem, përzgjidhni kompanisë dhe Partisë Lloji i parë",
 Please select Company and Posting Date to getting entries,Ju lutemi zgjidhni Kompania dhe Data e Postimit për marrjen e shënimeve,
 Please select Company first,Ju lutemi zgjidhni kompania e parë,
 Please select Completion Date for Completed Asset Maintenance Log,Ju lutemi zgjidhni Datën e Përfundimit për Mirëmbajtjen e Mbaruar të Mirëmbajtjes së Aseteve,
@@ -2980,7 +2977,6 @@
 The name of your company for which you are setting up this system.,Emri i kompanisë suaj për të cilën ju jeni të vendosur këtë sistem.,
 The number of shares and the share numbers are inconsistent,Numri i aksioneve dhe numri i aksioneve nuk janë në përputhje,
 The payment gateway account in plan {0} is different from the payment gateway account in this payment request,Llogaria e portës së pagesës në planin {0} ndryshon nga llogaria e portës së pagesës në këtë kërkesë pagese,
-The request for quotation can be accessed by clicking on the following link,Kërkesa për kuotim mund të arrihen duke klikuar në linkun e mëposhtëm,
 The selected BOMs are not for the same item,Të BOM përzgjedhur nuk janë për të njëjtin artikull,
 The selected item cannot have Batch,Elementi i përzgjedhur nuk mund të ketë Serisë,
 The seller and the buyer cannot be the same,Shitësi dhe blerësi nuk mund të jenë të njëjta,
@@ -3130,7 +3126,6 @@
 Total flexible benefit component amount {0} should not be less than max benefits {1},Shuma totale e komponentit të përfitimit fleksibël {0} nuk duhet të jetë më pak se përfitimet maksimale {1},
 Total hours: {0},Gjithsej orë: {0},
 Total leaves allocated is mandatory for Leave Type {0},Totali i lejeve të alokuara është i detyrueshëm për llojin e pushimit {0},
-Total weightage assigned should be 100%. It is {0},Weightage Gjithsej caktuar duhet të jetë 100%. Kjo është {0},
 Total working hours should not be greater than max working hours {0},Orët totale të punës nuk duhet të jetë më e madhe se sa orë pune max {0},
 Total {0} ({1}),Total {0} ({1}),
 "Total {0} for all items is zero, may be you should change 'Distribute Charges Based On'","Total {0} për të gjitha sendet është zero, mund të jetë që ju duhet të ndryshojë &quot;Shpërndani akuzat Bazuar On &#39;",
@@ -3544,7 +3539,6 @@
 Company field is required,Kërkohet fusha e kompanisë,
 Creating Dimensions...,Krijimi i dimensioneve ...,
 Duplicate entry against the item code {0} and manufacturer {1},Kopjoni hyrjen kundër kodit të artikullit {0} dhe prodhuesit {1},
-Import Chart Of Accounts from CSV / Excel files,Importoni Listën e Llogarive nga skedarët CSV / Excel,
 Invalid GSTIN! The input you've entered doesn't match the GSTIN format for UIN Holders or Non-Resident OIDAR Service Providers,GSTIN i pavlefshëm! Inputi që keni futur nuk përputhet me formatin GSTIN për Mbajtësit UIN ose Ofruesit e Shërbimit OIDAR Jo-rezident,
 Invoice Grand Total,Fatura e përgjithshme totale,
 Last carbon check date cannot be a future date,Data e fundit e kontrollit të karbonit nuk mund të jetë një datë e ardhshme,
@@ -3921,7 +3915,6 @@
 Plaid public token error,Gabim në shenjë publike,
 Plaid transactions sync error,Gabim në sinkronizimin e transaksioneve të planifikuar,
 Please check the error log for details about the import errors,Ju lutemi kontrolloni regjistrin e gabimeve për detaje në lidhje me gabimet e importit,
-Please click on the following link to set your new password,Ju lutem klikoni në linkun e mëposhtëm për të vendosur fjalëkalimin tuaj të ri,
 Please create <b>DATEV Settings</b> for Company <b>{}</b>.,Ju lutemi krijoni <b>Cilësimet DATEV</b> për kompaninë <b>}</b> .,
 Please create adjustment Journal Entry for amount {0} ,Ju lutemi krijoni hyrjen rregulluese të ditarit për shumën {0},
 Please do not create more than 500 items at a time,Ju lutemi mos krijoni më shumë se 500 artikuj njëherësh,
@@ -3997,6 +3990,7 @@
 Release date must be in the future,Data e lëshimit duhet të jetë në të ardhmen,
 Relieving Date must be greater than or equal to Date of Joining,Data e besimit duhet të jetë më e madhe se ose e barabartë me datën e bashkimit,
 Rename,Riemërtoj,
+Rename Not Allowed,Riemërtimi nuk lejohet,
 Repayment Method is mandatory for term loans,Metoda e ripagimit është e detyrueshme për kreditë me afat,
 Repayment Start Date is mandatory for term loans,Data e fillimit të ripagimit është e detyrueshme për kreditë me afat,
 Report Item,Raporti Artikull,
@@ -4043,7 +4037,6 @@
 Select All,Zgjidhni të gjitha,
 Select Difference Account,Zgjidhni Llogarinë e Diferencës,
 Select a Default Priority.,Zgjidhni një përparësi të paracaktuar.,
-Select a Supplier from the Default Supplier List of the items below.,Zgjidhni një furnizues nga lista e furnizuesve të paracaktuar për artikujt më poshtë.,
 Select a company,Zgjidhni një kompani,
 Select finance book for the item {0} at row {1},Zgjidhni librin e financave për artikullin {0} në rresht {1,
 Select only one Priority as Default.,Zgjidhni vetëm një përparësi si të parazgjedhur.,
@@ -4247,7 +4240,6 @@
 Actual ,aktual,
 Add to cart,Futeni në kosh,
 Budget,buxhet,
-Chart Of Accounts Importer,Grafiku i Importuesve,
 Chart of Accounts,Grafiku i llogarive,
 Customer database.,Baza e të dhënave të klientit.,
 Days Since Last order,Ditët Që Rendit Fundit,
@@ -4546,7 +4538,6 @@
 Check Supplier Invoice Number Uniqueness,Kontrolloni Furnizuesi faturës Numri Unike,
 Make Payment via Journal Entry,Të bëjë pagesën përmes Journal Hyrja,
 Unlink Payment on Cancellation of Invoice,Shkëput Pagesa mbi anulimin e Faturë,
-Unlink Advance Payment on Cancelation of Order,Lakojeni paraprakisht Pagesën për Anulimin e Rendit,
 Book Asset Depreciation Entry Automatically,Zhvlerësimi Book Asset Hyrja Automatikisht,
 Automatically Add Taxes and Charges from Item Tax Template,Shtoni automatikisht taksat dhe tarifat nga modeli i taksave të artikujve,
 Automatically Fetch Payment Terms,Merr automatikisht Kushtet e Pagesës,
@@ -4940,7 +4931,6 @@
 POS Customer Group,POS Group Customer,
 POS Field,Fusha POS,
 POS Item Group,POS Item Group,
-[Select],[Zgjidh],
 Company Address,adresa e kompanise,
 Update Stock,Update Stock,
 Ignore Pricing Rule,Ignore Rregulla e Çmimeve,
@@ -6481,7 +6471,6 @@
 Appraisal Template,Vlerësimi Template,
 For Employee Name,Për Emri punonjës,
 Goals,Qëllimet,
-Calculate Total Score,Llogaritur Gjithsej Vota,
 Total Score (Out of 5),Rezultati i përgjithshëm (nga 5),
 "Any other remarks, noteworthy effort that should go in the records.","Çdo vërejtje të tjera, përpjekje të përmendet se duhet të shkoni në të dhënat.",
 Appraisal Goal,Vlerësimi Qëllimi,
@@ -6599,11 +6588,6 @@
 Reason for Leaving,Arsyeja e largimit,
 Leave Encashed?,Dërgo arkëtuar?,
 Encashment Date,Arkëtim Data,
-Exit Interview Details,Detajet Dil Intervista,
-Held On,Mbajtur më,
-Reason for Resignation,Arsyeja për dorëheqjen,
-Better Prospects,Perspektivë më të mirë,
-Health Concerns,Shqetësimet shëndetësore,
 New Workplace,New Workplace,
 HR-EAD-.YYYY.-,HR-EAD-.YYYY.-,
 Returned Amount,Shuma e kthyer,
@@ -8239,9 +8223,6 @@
 Manufacturers used in Items,Prodhuesit e përdorura në artikujt,
 Limited to 12 characters,Kufizuar në 12 karaktere,
 MAT-MR-.YYYY.-,MAT-MR-.YYYY.-,
-Set Warehouse,Set Magazina,
-Sets 'For Warehouse' in each row of the Items table.,Vendos &#39;Për Magazinë&#39; në secilën rresht të tabelës Artikuj.,
-Requested For,Kërkuar Për,
 Partially Ordered,Urdhërohet pjesërisht,
 Transferred,transferuar,
 % Ordered,% Urdhërohet,
@@ -8690,8 +8671,6 @@
 Select warehouse for material requests,Zgjidhni magazinën për kërkesat materiale,
 Transfer Materials For Warehouse {0},Transferimi i materialeve për magazinën {0},
 Production Plan Material Request Warehouse,Plani i Prodhimit Depo për Kërkesë Materiali,
-Set From Warehouse,Vendosur nga Magazina,
-Source Warehouse (Material Transfer),Depoja e Burimit (Transferimi i Materialit),
 Sets 'Source Warehouse' in each row of the items table.,Vendos &quot;Magazinën e Burimit&quot; në secilën rresht të tabelës së artikujve.,
 Sets 'Target Warehouse' in each row of the items table.,Vendos &#39;Magazina e synuar&#39; në secilën rresht të tabelës së artikujve.,
 Show Cancelled Entries,Shfaq hyrjet e anuluara,
@@ -9157,7 +9136,6 @@
 Is Income Tax Component,A është Komponenti i Tatimit mbi të Ardhurat,
 Component properties and references ,Karakteristikat dhe referencat e përbërësit,
 Additional Salary ,Paga shtesë,
-Condtion and formula,Kushti dhe formula,
 Unmarked days,Ditët e pashënuara,
 Absent Days,Ditët e Munguara,
 Conditions and Formula variable and example,Kushtet dhe variabla e Formulës dhe shembulli,
@@ -9444,7 +9422,6 @@
 Please check your Plaid client ID and secret values,Ju lutemi kontrolloni ID e klientit tuaj Plaid dhe vlerat sekrete,
 Bank transaction creation error,Gabim në krijimin e transaksioneve bankare,
 Unit of Measurement,Njësia e Matjes,
-Row #{}: Selling rate for item {} is lower than its {}. Selling rate should be atleast {},Rreshti # {}: Shkalla e shitjes për artikullin {} është më e ulët se {}. Shkalla e shitjes duhet të jetë së paku {},
 Fiscal Year {0} Does Not Exist,Viti Fiskal {0} Nuk Ekziston,
 Row # {0}: Returned Item {1} does not exist in {2} {3},Rreshti # {0}: Artikulli i kthyer {1} nuk ekziston në {2} {3},
 Valuation type charges can not be marked as Inclusive,Tarifat e llojit të vlerësimit nuk mund të shënohen si Përfshirëse,
@@ -9598,8 +9575,60 @@
 Response Time for {0} priority in row {1} can't be greater than Resolution Time.,Koha e përgjigjes për {0} përparësinë në rresht {1} nuk mund të jetë më e madhe se Koha e Rezolucionit.,
 {0} is not enabled in {1},{0} nuk është aktivizuar në {1},
 Group by Material Request,Grupo sipas kërkesës materiale,
-"Row {0}: For Supplier {0}, Email Address is Required to Send Email","Rreshti {0}: Për furnitorin {0}, kërkohet adresa e postës elektronike për të dërguar email",
 Email Sent to Supplier {0},Emaili u dërgua tek furnitori {0},
 "The Access to Request for Quotation From Portal is Disabled. To Allow Access, Enable it in Portal Settings.","Hyrja në kërkesë për kuotim nga Portali është e Çaktivizuar. Për të lejuar hyrjen, aktivizojeni atë në Cilësimet e Portalit.",
 Supplier Quotation {0} Created,Citati i furnitorit {0} Krijuar,
 Valid till Date cannot be before Transaction Date,E vlefshme deri në datën nuk mund të jetë para datës së transaksionit,
+Unlink Advance Payment on Cancellation of Order,Shkëputni Pagesën e Paradhënies për Anulimin e Porosisë,
+"Simple Python Expression, Example: territory != 'All Territories'","Shprehje e thjeshtë Python, Shembull: territor! = &#39;Të gjitha territoret&#39;",
+Sales Contributions and Incentives,Kontributet dhe stimujt e shitjeve,
+Sourced by Supplier,Me burim nga Furnizuesi,
+Total weightage assigned should be 100%.<br>It is {0},Pesha totale e caktuar duhet të jetë 100%.<br> {Shtë {0},
+Account {0} exists in parent company {1}.,Llogaria {0} ekziston në kompaninë mëmë {1}.,
+"To overrule this, enable '{0}' in company {1}","Për ta mbivendosur këtë, aktivizo &quot;{0}&quot; në kompaninë {1}",
+Invalid condition expression,Shprehje e pavlefshme e kushteve,
+Please Select a Company First,Ju lutemi Zgjidhni një kompani së pari,
+Please Select Both Company and Party Type First,Ju lutemi Zgjidhni Së pari Të dy Kompanitë dhe Llojin e Partisë,
+Provide the invoice portion in percent,Siguroni pjesën e faturës në përqindje,
+Give number of days according to prior selection,Jepni numrin e ditëve sipas zgjedhjes paraprake,
+Email Details,Detajet e emailit,
+"Select a greeting for the receiver. E.g. Mr., Ms., etc.","Zgjidhni një urim për marrësin. P.sh. Z., Znj., Etj.",
+Preview Email,Shikoni emailin,
+Please select a Supplier,Ju lutemi zgjidhni një Furnizues,
+Supplier Lead Time (days),Koha e furnizimit të furnizuesit (ditë),
+"Home, Work, etc.","Shtëpia, Puna, etj.",
+Exit Interview Held On,Intervista e Daljes E Mbyllur,
+Condition and formula,Kushti dhe formula,
+Sets 'Target Warehouse' in each row of the Items table.,Vendos &#39;Magazina e synuar&#39; në secilën rresht të tabelës Artikuj.,
+Sets 'Source Warehouse' in each row of the Items table.,Vendos &#39;Magazinën e Burimit&#39; në secilën rresht të tabelës Artikuj.,
+POS Register,Regjistrohu POS,
+"Can not filter based on POS Profile, if grouped by POS Profile","Nuk mund të filtrohet bazuar në Profilin e POS, nëse grupohet nga Profili i POS",
+"Can not filter based on Customer, if grouped by Customer","Nuk mund të filtrohet në bazë të Klientit, nëse grupohet nga Konsumatori",
+"Can not filter based on Cashier, if grouped by Cashier","Nuk mund të filtrohet bazuar në Arkën, nëse grupohet nga Arkëtari",
+Payment Method,Metoda e pagesës,
+"Can not filter based on Payment Method, if grouped by Payment Method","Nuk mund të filtrohet bazuar në mënyrën e pagesës, nëse grupohet sipas mënyrës së pagesës",
+Supplier Quotation Comparison,Krahasimi i Kuotimit të Furnizuesit,
+Price per Unit (Stock UOM),Çmimi për njësi (Stock UOM),
+Group by Supplier,Grupo nga furnitori,
+Group by Item,Grupo sipas Artikullit,
+Remember to set {field_label}. It is required by {regulation}.,Mos harroni të vendosni {field_label}. Kërkohet nga {rregullorja}.,
+Enrollment Date cannot be before the Start Date of the Academic Year {0},Data e regjistrimit nuk mund të jetë para datës së fillimit të vitit akademik {0},
+Enrollment Date cannot be after the End Date of the Academic Term {0},Data e regjistrimit nuk mund të jetë pas datës së mbarimit të afatit akademik {0},
+Enrollment Date cannot be before the Start Date of the Academic Term {0},Data e regjistrimit nuk mund të jetë para datës së fillimit të afatit akademik {0},
+Posting future transactions are not allowed due to Immutable Ledger,Postimi i transaksioneve në të ardhmen nuk lejohet për shkak të librit të pandryshueshëm,
+Future Posting Not Allowed,Postimi në të ardhmen nuk lejohet,
+"To enable Capital Work in Progress Accounting, ","Për të mundësuar Kontabilitetin e Punës Kapitale në Progres,",
+you must select Capital Work in Progress Account in accounts table,duhet të zgjidhni llogarinë e punës kapitale në progres në tabelën e llogarive,
+You can also set default CWIP account in Company {},Mund të caktoni gjithashtu llogarinë e paracaktuar CWIP në Kompaninë {},
+The Request for Quotation can be accessed by clicking on the following button,Kërkesa për Vlerësim mund të arrihet duke klikuar në butonin e mëposhtëm,
+Regards,Të fala,
+Please click on the following button to set your new password,Ju lutemi klikoni në butonin e mëposhtëm për të vendosur fjalëkalimin tuaj të ri,
+Update Password,Përditëso fjalëkalimin,
+Row #{}: Selling rate for item {} is lower than its {}. Selling {} should be atleast {},Rreshti # {}: Shkalla e shitjes për artikullin {} është më e ulët se {}. Shitja {} duhet të jetë së paku {},
+You can alternatively disable selling price validation in {} to bypass this validation.,Mund të çaktivizoni vërtetimin e çmimit të shitjes në {} për të anashkaluar këtë vërtetim.,
+Invalid Selling Price,Çmimi i pavlefshëm i shitjes,
+Address needs to be linked to a Company. Please add a row for Company in the Links table.,Adresa duhet të lidhet me një kompani. Ju lutemi shtoni një rresht për Kompaninë në tabelën Links.,
+Company Not Linked,Kompania nuk është e lidhur,
+Import Chart of Accounts from CSV / Excel files,Importo Tabelën e Llogarive nga skedarët CSV / Excel,
+Completed Qty cannot be greater than 'Qty to Manufacture',Sasia e përfunduar nuk mund të jetë më e madhe se &#39;Sasia për Prodhim&#39;,
+"Row {0}: For Supplier {1}, Email Address is Required to send an email","Rreshti {0}: Për furnitorin {1}, kërkohet adresa e postës elektronike për të dërguar një email",
diff --git a/erpnext/translations/sr.csv b/erpnext/translations/sr.csv
index dad0e7e..97b240f 100644
--- a/erpnext/translations/sr.csv
+++ b/erpnext/translations/sr.csv
@@ -521,7 +521,6 @@
 Chargeble,Цхаргебле,
 Charges are updated in Purchase Receipt against each item,Оптужбе се ажурирају у рачуном против сваке ставке,
 "Charges will be distributed proportionately based on item qty or amount, as per your selection","Оптужбе ће бити дистрибуиран пропорционално на основу тачка Количина или износа, по вашем избору",
-Chart Of Accounts,Контни,
 Chart of Cost Centers,Дијаграм трошкова центара,
 Check all,Štiklirati sve,
 Checkout,Провери,
@@ -581,7 +580,6 @@
 Compensatory Off,Компенсационные Выкл,
 Compensatory leave request days not in valid holidays,Данови захтјева за компензацијски одмор нису у важећем празнику,
 Complaint,Жалба,
-Completed Qty can not be greater than 'Qty to Manufacture',Завршен ком не може бити већи од 'Количина за производњу',
 Completion Date,Завршетак датум,
 Computer,рачунар,
 Condition,Услов,
@@ -2033,7 +2031,6 @@
 Please select Charge Type first,Изаберите Тип пуњења први,
 Please select Company,Молимо изаберите Цомпани,
 Please select Company and Designation,Изаберите компанију и ознаку,
-Please select Company and Party Type first,Молимо Вас да изаберете Цомпани и Партије Типе прво,
 Please select Company and Posting Date to getting entries,Молимо да одаберете Компанију и Датум објављивања да бисте добили уносе,
 Please select Company first,Одредите прво Компанија,
 Please select Completion Date for Completed Asset Maintenance Log,Молимо изаберите Датум завршетка за попуњени дневник одржавања средстава,
@@ -2980,7 +2977,6 @@
 The name of your company for which you are setting up this system.,Име ваше компаније за коју сте се постављање овог система .,
 The number of shares and the share numbers are inconsistent,Број акција и бројеви учешћа су недоследни,
 The payment gateway account in plan {0} is different from the payment gateway account in this payment request,Рачун плаћачког плаћања у плану {0} се разликује од налога за плаћање у овом налогу за плаћање,
-The request for quotation can be accessed by clicking on the following link,Захтев за котацију се може приступити кликом на следећи линк,
 The selected BOMs are not for the same item,Одабрани БОМ нису за исту робу,
 The selected item cannot have Batch,Изабрана опција не може имати Батцх,
 The seller and the buyer cannot be the same,Продавац и купац не могу бити исти,
@@ -3130,7 +3126,6 @@
 Total flexible benefit component amount {0} should not be less than max benefits {1},Укупни износ компоненте флексибилне накнаде {0} не сме бити мањи од максималне накнаде {1},
 Total hours: {0},Укупно часова: {0},
 Total leaves allocated is mandatory for Leave Type {0},Укупна издвојена листића су обавезна за Тип Леаве {0},
-Total weightage assigned should be 100%. It is {0},Всего Weightage назначен должна быть 100% . Это {0},
 Total working hours should not be greater than max working hours {0},Укупно радно време не би требало да буде већи од мак радних сати {0},
 Total {0} ({1}),Укупно {0} ({1}),
 "Total {0} for all items is zero, may be you should change 'Distribute Charges Based On'","Укупно {0} за све ставке је нула, може бити требало би да промените &#39;Распоредите пријава по&#39;",
@@ -3544,7 +3539,6 @@
 Company field is required,Поље компаније је обавезно,
 Creating Dimensions...,Стварање димензија ...,
 Duplicate entry against the item code {0} and manufacturer {1},Дупликат уноса са шифром артикла {0} и произвођачем {1},
-Import Chart Of Accounts from CSV / Excel files,Увоз рачуна са ЦСВ / Екцел датотека,
 Invalid GSTIN! The input you've entered doesn't match the GSTIN format for UIN Holders or Non-Resident OIDAR Service Providers,Неважећи ГСТИН! Унесени унос не одговара ГСТИН формату за УИН власнике или нерезидентне добављаче услуга ОИДАР,
 Invoice Grand Total,Фактура Гранд Тотал,
 Last carbon check date cannot be a future date,Последњи датум провере угљеника не може бити будући датум,
@@ -3921,7 +3915,6 @@
 Plaid public token error,Грешка у јавном токену,
 Plaid transactions sync error,Грешка синхронизације трансакција у плаиду,
 Please check the error log for details about the import errors,Молимо проверите дневник грешака за детаље о увозним грешкама,
-Please click on the following link to set your new password,Молимо вас да кликнете на следећи линк да поставите нову лозинку,
 Please create <b>DATEV Settings</b> for Company <b>{}</b>.,<b>Креирајте ДАТЕВ подешавања</b> за компанију <b>{}</b> .,
 Please create adjustment Journal Entry for amount {0} ,Молимо креирајте подешавање уноса у часопису за износ {0},
 Please do not create more than 500 items at a time,Не стварајте више од 500 предмета одједном,
@@ -3997,6 +3990,7 @@
 Release date must be in the future,Датум изласка мора бити у будућности,
 Relieving Date must be greater than or equal to Date of Joining,Датум ослобађања мора бити већи или једнак датуму придруживања,
 Rename,Преименовање,
+Rename Not Allowed,Преименовање није дозвољено,
 Repayment Method is mandatory for term loans,Начин отплате је обавезан за орочене кредите,
 Repayment Start Date is mandatory for term loans,Датум почетка отплате је обавезан за орочене кредите,
 Report Item,Извештај,
@@ -4043,7 +4037,6 @@
 Select All,Изабери све,
 Select Difference Account,Изаберите Рачун разлике,
 Select a Default Priority.,Изаберите подразумевани приоритет.,
-Select a Supplier from the Default Supplier List of the items below.,Изаберите добављача са задате листе добављача доњих ставки.,
 Select a company,Изаберите компанију,
 Select finance book for the item {0} at row {1},Изаберите књигу финансирања за ставку {0} у реду {1},
 Select only one Priority as Default.,Изаберите само један приоритет као подразумевани.,
@@ -4247,7 +4240,6 @@
 Actual ,Стваран,
 Add to cart,Добавить в корзину,
 Budget,Буџет,
-Chart Of Accounts Importer,Увозник контног плана,
 Chart of Accounts,Цхарт оф Аццоунтс,
 Customer database.,Цустомер Датабасе.,
 Days Since Last order,Дана Од Последња Наручи,
@@ -4546,7 +4538,6 @@
 Check Supplier Invoice Number Uniqueness,Одлазак добављача Фактура број јединственост,
 Make Payment via Journal Entry,Извршити уплату преко Јоурнал Ентри,
 Unlink Payment on Cancellation of Invoice,Унлинк плаћања о отказивању рачуна,
-Unlink Advance Payment on Cancelation of Order,Прекидајте везу аванса од отказивања наруџбе,
 Book Asset Depreciation Entry Automatically,Књига имовине Амортизација Ступање Аутоматски,
 Automatically Add Taxes and Charges from Item Tax Template,Аутоматски додајте порезе и дажбине са предлошка пореза на ставке,
 Automatically Fetch Payment Terms,Аутоматски преузми услове плаћања,
@@ -4940,7 +4931,6 @@
 POS Customer Group,ПОС клијента Група,
 POS Field,ПОС поље,
 POS Item Group,ПОС Тачка Група,
-[Select],[ Изаберите ],
 Company Address,Адреса предузећа,
 Update Stock,Упдате Стоцк,
 Ignore Pricing Rule,Игноре Правилник о ценама,
@@ -6481,7 +6471,6 @@
 Appraisal Template,Процена Шаблон,
 For Employee Name,За запосленог Име,
 Goals,Циљеви,
-Calculate Total Score,Израчунајте Укупна оцена,
 Total Score (Out of 5),Укупна оцена (Оут оф 5),
 "Any other remarks, noteworthy effort that should go in the records.","Било који други примедбе, напоменути напор који треба да иде у евиденцији.",
 Appraisal Goal,Процена Гол,
@@ -6599,11 +6588,6 @@
 Reason for Leaving,Разлог за напуштање,
 Leave Encashed?,Оставите Енцасхед?,
 Encashment Date,Датум Енцасхмент,
-Exit Interview Details,Екит Детаљи Интервју,
-Held On,Одржана,
-Reason for Resignation,Разлог за оставку,
-Better Prospects,Бољи изгледи,
-Health Concerns,Здравље Забринутост,
 New Workplace,Новом радном месту,
 HR-EAD-.YYYY.-,ХР-ЕАД-.ИИИИ.-,
 Returned Amount,Износ враћеног износа,
@@ -8239,9 +8223,6 @@
 Manufacturers used in Items,Произвођачи користе у ставке,
 Limited to 12 characters,Ограничена до 12 карактера,
 MAT-MR-.YYYY.-,МАТ-МР-.ИИИИ.-,
-Set Warehouse,Сет Варехоусе,
-Sets 'For Warehouse' in each row of the Items table.,Поставља &#39;За складиште&#39; у сваком реду табеле Предмети.,
-Requested For,Тражени За,
 Partially Ordered,Делимично уређено,
 Transferred,пренети,
 % Ordered,% Од А до Ж,
@@ -8690,8 +8671,6 @@
 Select warehouse for material requests,Изаберите складиште за захтеве за материјалом,
 Transfer Materials For Warehouse {0},Трансфер материјала за складиште {0},
 Production Plan Material Request Warehouse,Складиште захтева за планом производње,
-Set From Warehouse,Постављено из магацина,
-Source Warehouse (Material Transfer),Изворно складиште (пренос материјала),
 Sets 'Source Warehouse' in each row of the items table.,Поставља &#39;Изворно складиште&#39; у сваки ред табеле ставки.,
 Sets 'Target Warehouse' in each row of the items table.,Поставља &#39;Таргет Варехоусе&#39; у сваки ред табеле ставки.,
 Show Cancelled Entries,Прикажи отказане уносе,
@@ -9157,7 +9136,6 @@
 Is Income Tax Component,Је компонента пореза на доходак,
 Component properties and references ,Својства и референце компонената,
 Additional Salary ,Додатна плата,
-Condtion and formula,Стање и формула,
 Unmarked days,Необележени дани,
 Absent Days,Одсутни дани,
 Conditions and Formula variable and example,Услови и варијабла формуле и пример,
@@ -9444,7 +9422,6 @@
 Please check your Plaid client ID and secret values,Молимо проверите свој ИД клијента и тајне вредности,
 Bank transaction creation error,Грешка у креирању банкарске трансакције,
 Unit of Measurement,Јединица мере,
-Row #{}: Selling rate for item {} is lower than its {}. Selling rate should be atleast {},Ред # {}: Стопа продаје за артикал {} нижа је од његове {}. Стопа продаје треба да буде најмање {},
 Fiscal Year {0} Does Not Exist,Фискална година {0} не постоји,
 Row # {0}: Returned Item {1} does not exist in {2} {3},Ред # {0}: Враћена ставка {1} не постоји у {2} {3},
 Valuation type charges can not be marked as Inclusive,Накнаде за врсту процене не могу бити означене као свеобухватне,
@@ -9598,8 +9575,60 @@
 Response Time for {0} priority in row {1} can't be greater than Resolution Time.,Време одзива за {0} приоритет у реду {1} не може бити веће од времена резолуције.,
 {0} is not enabled in {1},{0} није омогућен у {1},
 Group by Material Request,Групирај према захтеву за материјал,
-"Row {0}: For Supplier {0}, Email Address is Required to Send Email",Ред {0}: За добављача {0} адреса е-поште је потребна за слање е-поште,
 Email Sent to Supplier {0},Е-пошта послата добављачу {0},
 "The Access to Request for Quotation From Portal is Disabled. To Allow Access, Enable it in Portal Settings.","Приступ захтеву за понуду са портала је онемогућен. Да бисте дозволили приступ, омогућите га у поставкама портала.",
 Supplier Quotation {0} Created,Понуда добављача {0} креирана,
 Valid till Date cannot be before Transaction Date,Важи до Датум не може бити пре датума трансакције,
+Unlink Advance Payment on Cancellation of Order,Опозови везу авансног плаћања при отказивању поруџбине,
+"Simple Python Expression, Example: territory != 'All Territories'","Једноставни Питхон израз, пример: територија! = &#39;Све територије&#39;",
+Sales Contributions and Incentives,Доприноси продаји и подстицаји,
+Sourced by Supplier,Извор добављача,
+Total weightage assigned should be 100%.<br>It is {0},Укупна додељена тежина треба да буде 100%.<br> То је {0},
+Account {0} exists in parent company {1}.,Налог {0} постоји у матичном предузећу {1}.,
+"To overrule this, enable '{0}' in company {1}","Да бисте ово поништили, омогућите „{0}“ у предузећу {1}",
+Invalid condition expression,Неважећи израз услова,
+Please Select a Company First,Прво одаберите компанију,
+Please Select Both Company and Party Type First,Прво одаберите и компанију и журку,
+Provide the invoice portion in percent,Наведите део фактуре у процентима,
+Give number of days according to prior selection,Наведите број дана према претходном одабиру,
+Email Details,Детаљи е-поште,
+"Select a greeting for the receiver. E.g. Mr., Ms., etc.","Изаберите поздрав за пријемник. Нпр. Господин, госпођа итд.",
+Preview Email,Преглед е-поште,
+Please select a Supplier,Молимо одаберите добављача,
+Supplier Lead Time (days),Време испоруке добављача (дана),
+"Home, Work, etc.","Кућа, посао итд.",
+Exit Interview Held On,Излазни интервју одржан,
+Condition and formula,Стање и формула,
+Sets 'Target Warehouse' in each row of the Items table.,Поставља &#39;Таргет Варехоусе&#39; у сваки ред табеле Предмети.,
+Sets 'Source Warehouse' in each row of the Items table.,Поставља &#39;Изворно складиште&#39; у сваки ред табеле Предмети.,
+POS Register,ПОС регистар,
+"Can not filter based on POS Profile, if grouped by POS Profile",Није могуће филтрирати на основу ПОС профила ако је груписано према ПОС профилу,
+"Can not filter based on Customer, if grouped by Customer",Не може се филтрирати на основу купца ако га је груписао купац,
+"Can not filter based on Cashier, if grouped by Cashier","Није могуће филтрирати на основу благајне, ако је груписана по благајни",
+Payment Method,Начин плаћања,
+"Can not filter based on Payment Method, if grouped by Payment Method",Није могуће филтрирати на основу начина плаћања ако је груписано према начину плаћања,
+Supplier Quotation Comparison,Поређење понуда добављача,
+Price per Unit (Stock UOM),Цена по јединици (УОМ),
+Group by Supplier,Група према добављачу,
+Group by Item,Групирај по ставкама,
+Remember to set {field_label}. It is required by {regulation}.,Не заборавите да поставите {фиелд_лабел}. То захтева {пропис}.,
+Enrollment Date cannot be before the Start Date of the Academic Year {0},Датум уписа не може бити пре датума почетка академске године {0},
+Enrollment Date cannot be after the End Date of the Academic Term {0},Датум уписа не може бити након датума завршетка академског рока {0},
+Enrollment Date cannot be before the Start Date of the Academic Term {0},Датум уписа не може бити пре датума почетка академског рока {0},
+Posting future transactions are not allowed due to Immutable Ledger,Књижење будућих трансакција није дозвољено због Непроменљиве књиге,
+Future Posting Not Allowed,Објављивање у будућности није дозвољено,
+"To enable Capital Work in Progress Accounting, ","Да би се омогућило рачуноводство капиталног рада у току,",
+you must select Capital Work in Progress Account in accounts table,у табели рачуна морате одабрати Рачун капиталног рада у току,
+You can also set default CWIP account in Company {},Такође можете да поставите подразумевани ЦВИП налог у предузећу {},
+The Request for Quotation can be accessed by clicking on the following button,Захтеву за понуду можете приступити кликом на следеће дугме,
+Regards,Поздрави,
+Please click on the following button to set your new password,Кликните на следеће дугме да бисте поставили нову лозинку,
+Update Password,Ажурирај лозинку,
+Row #{}: Selling rate for item {} is lower than its {}. Selling {} should be atleast {},Ред # {}: Стопа продаје за артикал {} нижа је од његове {}. Продаја {} треба да буде најмање {},
+You can alternatively disable selling price validation in {} to bypass this validation.,Можете и да онемогућите проверу продајне цене у {} да бисте заобишли ову проверу.,
+Invalid Selling Price,Неважећа продајна цена,
+Address needs to be linked to a Company. Please add a row for Company in the Links table.,Адреса мора бити повезана са компанијом. Додајте ред за компанију у табелу Везе.,
+Company Not Linked,Компанија није повезана,
+Import Chart of Accounts from CSV / Excel files,Увезите контни план из ЦСВ / Екцел датотека,
+Completed Qty cannot be greater than 'Qty to Manufacture',Завршена количина не може бити већа од „Количина за производњу“,
+"Row {0}: For Supplier {1}, Email Address is Required to send an email",Ред {0}: За добављача {1} за слање е-поште потребна је адреса е-поште,
diff --git a/erpnext/translations/sr_sp.csv b/erpnext/translations/sr_sp.csv
index b41c0ec..ef261b9 100644
--- a/erpnext/translations/sr_sp.csv
+++ b/erpnext/translations/sr_sp.csv
@@ -93,7 +93,6 @@
 Cart,Korpa,
 Cart is Empty,Korpa je prazna,
 Change Amount,Kusur,
-Chart Of Accounts,Kontni plan,
 Cheque/Reference No,Broj izvoda,
 Closed,Zatvoreno,
 Closing (Cr),Saldo (Po),
diff --git a/erpnext/translations/sv.csv b/erpnext/translations/sv.csv
index 17822ee..ec16aec 100644
--- a/erpnext/translations/sv.csv
+++ b/erpnext/translations/sv.csv
@@ -521,7 +521,6 @@
 Chargeble,chargeble,
 Charges are updated in Purchase Receipt against each item,Avgifter uppdateras i inköpskvitto för varje post,
 "Charges will be distributed proportionately based on item qty or amount, as per your selection","Avgifter kommer att fördelas proportionellt baserad på produktantal eller belopp, enligt ditt val",
-Chart Of Accounts,Kontoplan,
 Chart of Cost Centers,Kontoplan på Kostnadsställen,
 Check all,Kontrollera alla,
 Checkout,Checka ut,
@@ -581,7 +580,6 @@
 Compensatory Off,Kompensations Av,
 Compensatory leave request days not in valid holidays,Begäran om kompensationsledighet gäller inte i giltiga helgdagar,
 Complaint,Klagomål,
-Completed Qty can not be greater than 'Qty to Manufacture',"Avslutade Antal kan inte vara större än ""antal för Tillverkning '",
 Completion Date,Slutförande Datum,
 Computer,Dator,
 Condition,Tillstånd,
@@ -2033,7 +2031,6 @@
 Please select Charge Type first,Välj Avgiftstyp först,
 Please select Company,Välj Företag,
 Please select Company and Designation,Var god välj Företag och Beteckning,
-Please select Company and Party Type first,Välj Företag och parti typ först,
 Please select Company and Posting Date to getting entries,Var god välj Företag och Bokningsdatum för att få poster,
 Please select Company first,Välj Företaget först,
 Please select Completion Date for Completed Asset Maintenance Log,Var god välj Slutdatum för slutförd underhållsförteckning,
@@ -2980,7 +2977,6 @@
 The name of your company for which you are setting up this system.,Namnet på ditt företag som du ställer in det här systemet.,
 The number of shares and the share numbers are inconsistent,Antal aktier och aktienumren är inkonsekventa,
 The payment gateway account in plan {0} is different from the payment gateway account in this payment request,Betalningsgateway-kontot i plan {0} skiljer sig från betalnings gateway-kontot i denna betalningsförfrågan,
-The request for quotation can be accessed by clicking on the following link,Offertbegäran kan nås genom att klicka på följande länk,
 The selected BOMs are not for the same item,De valda stycklistor är inte samma objekt,
 The selected item cannot have Batch,Det valda alternativet kan inte ha Batch,
 The seller and the buyer cannot be the same,Säljaren och köparen kan inte vara samma,
@@ -3130,7 +3126,6 @@
 Total flexible benefit component amount {0} should not be less than max benefits {1},Det totala beloppet för flexibel förmån {0} bör inte vara mindre än maxförmåner {1},
 Total hours: {0},Totalt antal timmar: {0},
 Total leaves allocated is mandatory for Leave Type {0},Totalt antal tillåtna blad är obligatoriska för avgångstyp {0},
-Total weightage assigned should be 100%. It is {0},Totalt weightage delas ska vara 100%. Det är {0},
 Total working hours should not be greater than max working hours {0},Totalt arbetstid bör inte vara större än max arbetstid {0},
 Total {0} ({1}),Totalt {0} ({1}),
 "Total {0} for all items is zero, may be you should change 'Distribute Charges Based On'",Totalt {0} för alla objekt är noll kan vara du bör ändra &#39;Fördela avgifter bygger på&#39;,
@@ -3544,7 +3539,6 @@
 Company field is required,Företagets fält krävs,
 Creating Dimensions...,Skapar dimensioner ...,
 Duplicate entry against the item code {0} and manufacturer {1},Duplicera posten mot artikelkoden {0} och tillverkaren {1},
-Import Chart Of Accounts from CSV / Excel files,Importera kontoplan från CSV / Excel-filer,
 Invalid GSTIN! The input you've entered doesn't match the GSTIN format for UIN Holders or Non-Resident OIDAR Service Providers,Ogiltig GSTIN! Ingången du har angett stämmer inte med GSTIN-formatet för UIN-innehavare eller OIDAR-tjänsteleverantörer som inte är bosatta,
 Invoice Grand Total,Fakturor Grand Total,
 Last carbon check date cannot be a future date,Sista datum för kolkontroll kan inte vara ett framtida datum,
@@ -3921,7 +3915,6 @@
 Plaid public token error,Plaid public token-fel,
 Plaid transactions sync error,Fel synkroniseringsfel,
 Please check the error log for details about the import errors,Kontrollera felloggen för detaljer om importfel,
-Please click on the following link to set your new password,Klicka på följande länk för att ställa in ditt nya lösenord,
 Please create <b>DATEV Settings</b> for Company <b>{}</b>.,<b>Skapa DATEV-inställningar</b> för företag <b>{}</b> .,
 Please create adjustment Journal Entry for amount {0} ,Skapa justeringsjournal för belopp {0},
 Please do not create more than 500 items at a time,Skapa inte mer än 500 objekt åt gången,
@@ -3997,6 +3990,7 @@
 Release date must be in the future,Släppdatum måste vara i framtiden,
 Relieving Date must be greater than or equal to Date of Joining,Relief-datum måste vara större än eller lika med Datum för anslutning,
 Rename,Byt namn,
+Rename Not Allowed,Byt namn inte tillåtet,
 Repayment Method is mandatory for term loans,Återbetalningsmetod är obligatorisk för lån,
 Repayment Start Date is mandatory for term loans,Startdatum för återbetalning är obligatoriskt för lån,
 Report Item,Rapportera objekt,
@@ -4043,7 +4037,6 @@
 Select All,Välj Alla,
 Select Difference Account,Välj Skillnadskonto,
 Select a Default Priority.,Välj en standardprioritet.,
-Select a Supplier from the Default Supplier List of the items below.,Välj en leverantör från standardleverantörslistan med artiklarna nedan.,
 Select a company,Välj ett företag,
 Select finance book for the item {0} at row {1},Välj finansbok för posten {0} i rad {1},
 Select only one Priority as Default.,Välj endast en prioritet som standard.,
@@ -4247,7 +4240,6 @@
 Actual ,Faktisk,
 Add to cart,Lägg till i kundvagn,
 Budget,Budget,
-Chart Of Accounts Importer,Diagram över kontonimportör,
 Chart of Accounts,Diagram över konton,
 Customer database.,Kunddatabas.,
 Days Since Last order,Dagar sedan förra beställningen,
@@ -4546,7 +4538,6 @@
 Check Supplier Invoice Number Uniqueness,Kontrollera Leverantörens unika Fakturanummer,
 Make Payment via Journal Entry,Gör betalning via Journal Entry,
 Unlink Payment on Cancellation of Invoice,Bort länken Betalning på Indragning av faktura,
-Unlink Advance Payment on Cancelation of Order,Koppla bort förskottsbetalning vid beställning,
 Book Asset Depreciation Entry Automatically,Bokförtillgodskrivning automatiskt,
 Automatically Add Taxes and Charges from Item Tax Template,Lägg automatiskt till skatter och avgifter från artikelskattmallen,
 Automatically Fetch Payment Terms,Hämta automatiskt betalningsvillkor,
@@ -4940,7 +4931,6 @@
 POS Customer Group,POS Kundgrupp,
 POS Field,POS-fält,
 POS Item Group,POS Artikelgrupp,
-[Select],[Välj],
 Company Address,Företags Adress,
 Update Stock,Uppdatera lager,
 Ignore Pricing Rule,Ignorera Prisregler,
@@ -6481,7 +6471,6 @@
 Appraisal Template,Bedömning mall,
 For Employee Name,För anställdes namn,
 Goals,Mål,
-Calculate Total Score,Beräkna Totalsumma,
 Total Score (Out of 5),Totalt Betyg (Out of 5),
 "Any other remarks, noteworthy effort that should go in the records.","Alla andra anmärkningar, anmärkningsvärt ansträngning som ska gå i registren.",
 Appraisal Goal,Bedömning Mål,
@@ -6599,11 +6588,6 @@
 Reason for Leaving,Anledning för att lämna,
 Leave Encashed?,Lämna inlösen?,
 Encashment Date,Inlösnings Datum,
-Exit Interview Details,Avsluta intervju Detaljer,
-Held On,Höll På,
-Reason for Resignation,Anledning till Avgång,
-Better Prospects,Bättre prospekt,
-Health Concerns,Hälsoproblem,
 New Workplace,Ny Arbetsplats,
 HR-EAD-.YYYY.-,HR-EAD-.YYYY.-,
 Returned Amount,Återlämnat belopp,
@@ -8239,9 +8223,6 @@
 Manufacturers used in Items,Tillverkare som används i artiklar,
 Limited to 12 characters,Begränsat till 12 tecken,
 MAT-MR-.YYYY.-,MAT-MR-.YYYY.-,
-Set Warehouse,Ställ in lager,
-Sets 'For Warehouse' in each row of the Items table.,Ställer in &#39;För lager&#39; i varje rad i artikeltabellen.,
-Requested For,Begärd För,
 Partially Ordered,Delvis beställt,
 Transferred,Överförd,
 % Ordered,% Beställt,
@@ -8690,8 +8671,6 @@
 Select warehouse for material requests,Välj lager för materialförfrågningar,
 Transfer Materials For Warehouse {0},Överför material för lager {0},
 Production Plan Material Request Warehouse,Produktionsplan Materialbegärande lager,
-Set From Warehouse,Set från lager,
-Source Warehouse (Material Transfer),Source Warehouse (Material Transfer),
 Sets 'Source Warehouse' in each row of the items table.,Ställer in &#39;Source Warehouse&#39; i varje rad i artikelbordet.,
 Sets 'Target Warehouse' in each row of the items table.,Ställer in &#39;Target Warehouse&#39; i varje rad i artikelbordet.,
 Show Cancelled Entries,Visa avbrutna poster,
@@ -9157,7 +9136,6 @@
 Is Income Tax Component,Är inkomstskattekomponent,
 Component properties and references ,Komponentegenskaper och referenser,
 Additional Salary ,Ytterligare lön,
-Condtion and formula,Kondition och formel,
 Unmarked days,Omärkta dagar,
 Absent Days,Frånvarande dagar,
 Conditions and Formula variable and example,Villkor och formelvariabel och exempel,
@@ -9444,7 +9422,6 @@
 Please check your Plaid client ID and secret values,Kontrollera ditt Plaid-klient-ID och hemliga värden,
 Bank transaction creation error,Fel vid skapande av banktransaktioner,
 Unit of Measurement,Måttenhet,
-Row #{}: Selling rate for item {} is lower than its {}. Selling rate should be atleast {},Rad nr {}: Försäljningsgraden för artikeln {} är lägre än dess {}. Försäljningsgraden bör vara minst {},
 Fiscal Year {0} Does Not Exist,Räkenskapsåret {0} existerar inte,
 Row # {0}: Returned Item {1} does not exist in {2} {3},Rad # {0}: Returnerat objekt {1} finns inte i {2} {3},
 Valuation type charges can not be marked as Inclusive,Avgifter för värderingstyp kan inte markeras som inkluderande,
@@ -9598,8 +9575,60 @@
 Response Time for {0} priority in row {1} can't be greater than Resolution Time.,Svarstiden för {0} prioritet i rad {1} kan inte vara längre än upplösningstid.,
 {0} is not enabled in {1},{0} är inte aktiverat i {1},
 Group by Material Request,Gruppera efter materialförfrågan,
-"Row {0}: For Supplier {0}, Email Address is Required to Send Email",Rad {0}: För leverantör {0} krävs e-postadress för att skicka e-post,
 Email Sent to Supplier {0},E-post skickad till leverantör {0},
 "The Access to Request for Quotation From Portal is Disabled. To Allow Access, Enable it in Portal Settings.","Åtkomsten till begäran om offert från portalen är inaktiverad. För att tillåta åtkomst, aktivera den i portalinställningar.",
 Supplier Quotation {0} Created,Leverantör offert {0} Skapat,
 Valid till Date cannot be before Transaction Date,Giltigt till datum kan inte vara före transaktionsdatum,
+Unlink Advance Payment on Cancellation of Order,Lossa förskottsbetalning vid annullering av beställningen,
+"Simple Python Expression, Example: territory != 'All Territories'","Enkelt Python-uttryck, Exempel: territorium! = &#39;Alla territorier&#39;",
+Sales Contributions and Incentives,Försäljningsbidrag och incitament,
+Sourced by Supplier,Hämtas av leverantör,
+Total weightage assigned should be 100%.<br>It is {0},Total tilldelad vikt bör vara 100%.<br> Det är {0},
+Account {0} exists in parent company {1}.,Kontot {0} finns i moderbolaget {1}.,
+"To overrule this, enable '{0}' in company {1}","För att åsidosätta detta, aktivera {0} i företaget {1}",
+Invalid condition expression,Ogiltigt tillståndsuttryck,
+Please Select a Company First,Välj först ett företag,
+Please Select Both Company and Party Type First,Välj först både företags- och festtyp,
+Provide the invoice portion in percent,Ange fakturadelen i procent,
+Give number of days according to prior selection,Ange antal dagar enligt tidigare val,
+Email Details,E-postdetaljer,
+"Select a greeting for the receiver. E.g. Mr., Ms., etc.","Välj en hälsning till mottagaren. Till exempel Herr, Fru etc.",
+Preview Email,Förhandsgranska e-post,
+Please select a Supplier,Välj en leverantör,
+Supplier Lead Time (days),Leverantörens ledtid (dagar),
+"Home, Work, etc.","Hem, arbete etc.",
+Exit Interview Held On,Avsluta intervjun hålls,
+Condition and formula,Tillstånd och formel,
+Sets 'Target Warehouse' in each row of the Items table.,Ställer in &#39;Target Warehouse&#39; i varje rad i tabellen Items.,
+Sets 'Source Warehouse' in each row of the Items table.,Ställer in &#39;Source Warehouse&#39; i varje rad i tabellen Items.,
+POS Register,POS-register,
+"Can not filter based on POS Profile, if grouped by POS Profile","Kan inte filtrera baserat på POS-profil, om grupperad efter POS-profil",
+"Can not filter based on Customer, if grouped by Customer","Kan inte filtrera baserat på kund, om grupperad efter kund",
+"Can not filter based on Cashier, if grouped by Cashier","Kan inte filtrera baserat på Kassör, om grupperad efter Kassör",
+Payment Method,Betalningsmetod,
+"Can not filter based on Payment Method, if grouped by Payment Method","Kan inte filtrera baserat på betalningsmetod, om grupperad efter betalningsmetod",
+Supplier Quotation Comparison,Jämförelse av leverantörsnotering,
+Price per Unit (Stock UOM),Pris per enhet (lager UOM),
+Group by Supplier,Gruppera efter leverantör,
+Group by Item,Gruppera efter artikel,
+Remember to set {field_label}. It is required by {regulation}.,Kom ihåg att ställa in {field_label}. Det krävs enligt {Regulation}.,
+Enrollment Date cannot be before the Start Date of the Academic Year {0},Anmälningsdatum får inte vara före startåret för läsåret {0},
+Enrollment Date cannot be after the End Date of the Academic Term {0},Anmälningsdatum kan inte vara efter slutdatum för den akademiska termen {0},
+Enrollment Date cannot be before the Start Date of the Academic Term {0},Anmälningsdatum kan inte vara före startdatumet för den akademiska termen {0},
+Posting future transactions are not allowed due to Immutable Ledger,Att bokföra framtida transaktioner är inte tillåtet på grund av Immutable Ledger,
+Future Posting Not Allowed,Framtida utstationering tillåts inte,
+"To enable Capital Work in Progress Accounting, ","För att aktivera Capital Work in Progress Accounting,",
+you must select Capital Work in Progress Account in accounts table,du måste välja Capital Work in Progress-konto i kontotabellen,
+You can also set default CWIP account in Company {},Du kan också ange standard CWIP-konto i företaget {},
+The Request for Quotation can be accessed by clicking on the following button,Begäran om offert kan nås genom att klicka på följande knapp,
+Regards,Hälsningar,
+Please click on the following button to set your new password,Klicka på följande knapp för att ställa in ditt nya lösenord,
+Update Password,Uppdatera lösenord,
+Row #{}: Selling rate for item {} is lower than its {}. Selling {} should be atleast {},Rad nr {}: Försäljningsgraden för artikeln {} är lägre än dess {}. Att sälja {} bör vara minst {},
+You can alternatively disable selling price validation in {} to bypass this validation.,Du kan alternativt inaktivera validering av försäljningspris i {} för att kringgå denna validering.,
+Invalid Selling Price,Ogiltigt försäljningspris,
+Address needs to be linked to a Company. Please add a row for Company in the Links table.,Adressen måste kopplas till ett företag. Lägg till en rad för företag i tabellen Länkar.,
+Company Not Linked,Företaget är inte länkat,
+Import Chart of Accounts from CSV / Excel files,Importera kontoplan från CSV / Excel-filer,
+Completed Qty cannot be greater than 'Qty to Manufacture',Slutfört antal får inte vara större än &#39;Antal att tillverka&#39;,
+"Row {0}: For Supplier {1}, Email Address is Required to send an email",Rad {0}: För leverantör {1} krävs e-postadress för att skicka ett e-postmeddelande,
diff --git a/erpnext/translations/sw.csv b/erpnext/translations/sw.csv
index f019777..9fcc1a3 100644
--- a/erpnext/translations/sw.csv
+++ b/erpnext/translations/sw.csv
@@ -521,7 +521,6 @@
 Chargeble,Kubwa,
 Charges are updated in Purchase Receipt against each item,Malipo yanasasishwa katika Receipt ya Ununuzi dhidi ya kila kitu,
 "Charges will be distributed proportionately based on item qty or amount, as per your selection","Malipo yatasambazwa kulingana na bidhaa qty au kiasi, kulingana na uteuzi wako",
-Chart Of Accounts,Chati ya Akaunti,
 Chart of Cost Centers,Chati ya Vituo vya Gharama,
 Check all,Angalia yote,
 Checkout,Angalia,
@@ -581,7 +580,6 @@
 Compensatory Off,Off Compensation,
 Compensatory leave request days not in valid holidays,Siku ya ombi ya kuondoka kwa siku ya malipo sio likizo za halali,
 Complaint,Malalamiko,
-Completed Qty can not be greater than 'Qty to Manufacture',Uchina uliokamilika hauwezi kuwa mkubwa kuliko &#39;Uchina kwa Utengenezaji&#39;,
 Completion Date,Tarehe ya kukamilisha,
 Computer,Kompyuta,
 Condition,Hali,
@@ -2033,7 +2031,6 @@
 Please select Charge Type first,Tafadhali chagua Aina ya Chapa kwanza,
 Please select Company,Tafadhali chagua Kampuni,
 Please select Company and Designation,Tafadhali chagua Kampuni na Uteuzi,
-Please select Company and Party Type first,Tafadhali chagua Aina ya Kampuni na Chapa kwanza,
 Please select Company and Posting Date to getting entries,Tafadhali chagua tarehe ya Kampuni na Kuajili ili uweze kuingia,
 Please select Company first,Tafadhali chagua Kampuni kwanza,
 Please select Completion Date for Completed Asset Maintenance Log,Tafadhali chagua tarehe ya kukamilika kwa Ingia ya Matengenezo ya Malifafishwa,
@@ -2980,7 +2977,6 @@
 The name of your company for which you are setting up this system.,Jina la kampuni yako ambayo unaanzisha mfumo huu.,
 The number of shares and the share numbers are inconsistent,Idadi ya hisa na nambari za kushiriki si sawa,
 The payment gateway account in plan {0} is different from the payment gateway account in this payment request,Akaunti ya mlango wa malipo katika mpango {0} ni tofauti na akaunti ya mlango wa malipo katika ombi hili la malipo,
-The request for quotation can be accessed by clicking on the following link,Ombi la nukuu inaweza kupatikana kwa kubonyeza kiungo kinachofuata,
 The selected BOMs are not for the same item,BOM zilizochaguliwa sio kwa bidhaa moja,
 The selected item cannot have Batch,Bidhaa iliyochaguliwa haiwezi kuwa na Batch,
 The seller and the buyer cannot be the same,Muuzaji na mnunuzi hawezi kuwa sawa,
@@ -3130,7 +3126,6 @@
 Total flexible benefit component amount {0} should not be less than max benefits {1},Jumla ya sehemu ya faida inayoweza kubadilika {0} haipaswi kuwa chini ya faida max {1},
 Total hours: {0},Masaa yote: {0},
 Total leaves allocated is mandatory for Leave Type {0},Majani yote yaliyotengwa ni ya lazima kwa Kuacha Aina {0},
-Total weightage assigned should be 100%. It is {0},Jumla ya uzito uliopangwa lazima iwe 100%. Ni {0},
 Total working hours should not be greater than max working hours {0},Jumla ya masaa ya kufanya kazi hayapaswi kuwa kubwa kuliko masaa ya kufanya kazi max {0},
 Total {0} ({1}),Jumla {0} ({1}),
 "Total {0} for all items is zero, may be you should change 'Distribute Charges Based On'","Jumla ya {0} kwa vitu vyote ni sifuri, huenda unapaswa kubadilisha &#39;Kusambaza mishahara ya msingi&#39;",
@@ -3544,7 +3539,6 @@
 Company field is required,Sehemu ya kampuni inahitajika,
 Creating Dimensions...,Inaunda vipimo ...,
 Duplicate entry against the item code {0} and manufacturer {1},Ingizo maradufu dhidi ya nambari ya bidhaa {0} na mtengenezaji {1},
-Import Chart Of Accounts from CSV / Excel files,Ingiza Chati ya Hesabu kutoka faili za CSV / Excel,
 Invalid GSTIN! The input you've entered doesn't match the GSTIN format for UIN Holders or Non-Resident OIDAR Service Providers,GSTIN batili! Uingizaji ambao umeingia haulingani na fomati ya GSTIN ya Wamiliki wa UIN au Watoa Huduma wa OIDAR wasio Wakazi,
 Invoice Grand Total,Jumla ya ankara,
 Last carbon check date cannot be a future date,Tarehe ya mwisho ya kuangalia kaboni haiwezi kuwa tarehe ya baadaye,
@@ -3921,7 +3915,6 @@
 Plaid public token error,Makosa ya ishara ya umma,
 Plaid transactions sync error,Makosa ya kusawazisha shughuli,
 Please check the error log for details about the import errors,Tafadhali angalia logi ya makosa kwa maelezo juu ya makosa ya uingizaji,
-Please click on the following link to set your new password,Tafadhali bofya kiungo kinachofuata ili kuweka nenosiri lako jipya,
 Please create <b>DATEV Settings</b> for Company <b>{}</b>.,Tafadhali unda <b>Mipangilio ya DATEV</b> ya Kampuni <b>{}</b> .,
 Please create adjustment Journal Entry for amount {0} ,Tafadhali tengeneza uingizaji wa Jarida la Marekebisho kwa kiasi {0},
 Please do not create more than 500 items at a time,Tafadhali usijenge vitu zaidi ya 500 kwa wakati mmoja,
@@ -3997,6 +3990,7 @@
 Release date must be in the future,Tarehe ya kutolewa lazima iwe katika siku zijazo,
 Relieving Date must be greater than or equal to Date of Joining,Tarehe ya Kuachana lazima iwe kubwa kuliko au sawa na Tarehe ya Kujiunga,
 Rename,Badilisha tena,
+Rename Not Allowed,Badili jina Hairuhusiwi,
 Repayment Method is mandatory for term loans,Njia ya Kurudisha ni lazima kwa mikopo ya muda mrefu,
 Repayment Start Date is mandatory for term loans,Tarehe ya kuanza Kulipa ni lazima kwa mkopo wa muda mrefu,
 Report Item,Ripoti Jambo,
@@ -4043,7 +4037,6 @@
 Select All,Chagua Wote,
 Select Difference Account,Chagua Akaunti ya Tofauti,
 Select a Default Priority.,Chagua Kipaumbele Cha msingi.,
-Select a Supplier from the Default Supplier List of the items below.,Chagua Mtoaji kutoka Orodha ya Wasambazaji Chaguo-msingi ya vitu hapa chini.,
 Select a company,Chagua kampuni,
 Select finance book for the item {0} at row {1},Chagua kitabu cha fedha kwa kipengee hicho 0 0 kwa safu {1},
 Select only one Priority as Default.,Chagua Kipaumbele kimoja tu kama Chaguo-msingi.,
@@ -4247,7 +4240,6 @@
 Actual ,Kweli,
 Add to cart,Ongeza kwenye Cart,
 Budget,Bajeti,
-Chart Of Accounts Importer,Chati Ya kuingiza Akaunti,
 Chart of Accounts,Chati ya Akaunti,
 Customer database.,Database ya Wateja.,
 Days Since Last order,Siku Tangu Toleo la Mwisho,
@@ -4546,7 +4538,6 @@
 Check Supplier Invoice Number Uniqueness,Angalia Nambari ya Nambari ya Invoice ya Wauzaji,
 Make Payment via Journal Entry,Fanya Malipo kupitia Ingia ya Machapisho,
 Unlink Payment on Cancellation of Invoice,Unlink Malipo ya Kuondoa Invoice,
-Unlink Advance Payment on Cancelation of Order,Ondoa Malipo ya Malipo kabla ya Kufuta Agizo,
 Book Asset Depreciation Entry Automatically,Kitabu cha Kushindwa kwa Athari ya Kitabu Kwa moja kwa moja,
 Automatically Add Taxes and Charges from Item Tax Template,Ongeza moja kwa moja Ushuru na malipo kutoka kwa Kigeuzo cha Ushuru wa Bidhaa,
 Automatically Fetch Payment Terms,Chukua moja kwa moja Masharti ya Malipo,
@@ -4940,7 +4931,6 @@
 POS Customer Group,Kundi la Wateja wa POS,
 POS Field,Shamba la POS,
 POS Item Group,Kundi la Bidhaa la POS,
-[Select],[Chagua],
 Company Address,Anwani ya Kampuni,
 Update Stock,Sasisha Stock,
 Ignore Pricing Rule,Piga Sheria ya bei,
@@ -6481,7 +6471,6 @@
 Appraisal Template,Kigezo cha Uhakiki,
 For Employee Name,Kwa Jina la Waajiriwa,
 Goals,Malengo,
-Calculate Total Score,Pata jumla ya alama,
 Total Score (Out of 5),Jumla ya alama (Kati ya 5),
 "Any other remarks, noteworthy effort that should go in the records.","Maneno mengine yoyote, jitihada zinazostahili ambazo zinapaswa kuingia kwenye rekodi.",
 Appraisal Goal,Lengo la Kutathmini,
@@ -6599,11 +6588,6 @@
 Reason for Leaving,Sababu ya Kuacha,
 Leave Encashed?,Je! Uacha Encashed?,
 Encashment Date,Tarehe ya Kuingiza,
-Exit Interview Details,Toka Maelezo ya Mahojiano,
-Held On,Imewekwa,
-Reason for Resignation,Sababu ya Kuondolewa,
-Better Prospects,Matarajio Bora,
-Health Concerns,Mateso ya Afya,
 New Workplace,Sehemu Mpya ya Kazi,
 HR-EAD-.YYYY.-,HR-EAD -YYYY.-,
 Returned Amount,Kiwango kilichorejeshwa,
@@ -8239,9 +8223,6 @@
 Manufacturers used in Items,Wazalishaji hutumiwa katika Vitu,
 Limited to 12 characters,Imepunguzwa kwa wahusika 12,
 MAT-MR-.YYYY.-,MAT-MR -YYYY.-,
-Set Warehouse,Weka Ghala,
-Sets 'For Warehouse' in each row of the Items table.,Inaweka &#39;Kwa Ghala&#39; katika kila safu ya jedwali la Vitu.,
-Requested For,Aliomba,
 Partially Ordered,Sehemu Iliyoagizwa,
 Transferred,Imehamishwa,
 % Ordered,Aliamriwa,
@@ -8690,8 +8671,6 @@
 Select warehouse for material requests,Chagua ghala kwa maombi ya nyenzo,
 Transfer Materials For Warehouse {0},Vifaa vya Kuhamisha kwa Ghala {0},
 Production Plan Material Request Warehouse,Mpango wa Uzalishaji Omba Ghala,
-Set From Warehouse,Imewekwa kutoka kwa Ghala,
-Source Warehouse (Material Transfer),Ghala la Chanzo (Uhamishaji wa Nyenzo),
 Sets 'Source Warehouse' in each row of the items table.,Inaweka &#39;Ghala la Chanzo&#39; katika kila safu ya jedwali la vitu.,
 Sets 'Target Warehouse' in each row of the items table.,Inaweka &#39;Ghala Lengwa&#39; katika kila safu ya jedwali la vitu.,
 Show Cancelled Entries,Onyesha Wasilisho Zilizofutwa,
@@ -9157,7 +9136,6 @@
 Is Income Tax Component,Ni Sehemu ya Ushuru wa Mapato,
 Component properties and references ,Vipengele vya mali na marejeleo,
 Additional Salary ,Mshahara wa Ziada,
-Condtion and formula,Condtion na fomula,
 Unmarked days,Siku ambazo hazijatiwa alama,
 Absent Days,Siku ambazo hazipo,
 Conditions and Formula variable and example,Masharti na Mfumo kutofautiana na mfano,
@@ -9444,7 +9422,6 @@
 Please check your Plaid client ID and secret values,Tafadhali angalia kitambulisho chako cha mteja wa Plaid na maadili ya siri,
 Bank transaction creation error,Hitilafu ya kuunda shughuli za benki,
 Unit of Measurement,Kitengo cha Upimaji,
-Row #{}: Selling rate for item {} is lower than its {}. Selling rate should be atleast {},Safu mlalo # {}: Kiwango cha kuuza cha bidhaa {} ni cha chini kuliko chake {}. Kiwango cha uuzaji kinapaswa kuwa angalau {},
 Fiscal Year {0} Does Not Exist,Mwaka wa Fedha {0} Haupo,
 Row # {0}: Returned Item {1} does not exist in {2} {3},Mstari # {0}: Bidhaa Iliyorudishwa {1} haipo katika {2} {3},
 Valuation type charges can not be marked as Inclusive,Gharama za aina ya uthamini haziwezi kutiwa alama kuwa ni pamoja,
@@ -9598,8 +9575,60 @@
 Response Time for {0} priority in row {1} can't be greater than Resolution Time.,Wakati wa Majibu wa {0} kipaumbele katika safu mlalo {1} hauwezi kuwa mkubwa kuliko Wakati wa Azimio.,
 {0} is not enabled in {1},{0} haijawezeshwa katika {1},
 Group by Material Request,Kikundi kwa Ombi la Nyenzo,
-"Row {0}: For Supplier {0}, Email Address is Required to Send Email","Safu mlalo {0}: Kwa Muuzaji {0}, Anwani ya Barua pepe Inahitajika Kutuma Barua pepe",
 Email Sent to Supplier {0},Barua pepe Iliyotumwa kwa Muuzaji {0},
 "The Access to Request for Quotation From Portal is Disabled. To Allow Access, Enable it in Portal Settings.","Ufikiaji wa Ombi la Nukuu kutoka kwa Portal umezimwa. Kuruhusu Ufikiaji, Wezesha katika Mipangilio ya Portal.",
 Supplier Quotation {0} Created,Nukuu ya Muuzaji {0} Imeundwa,
 Valid till Date cannot be before Transaction Date,Halali hadi Tarehe haiwezi kuwa kabla ya Tarehe ya Malipo,
+Unlink Advance Payment on Cancellation of Order,Tenganisha Malipo ya Mapema juu ya Kufutwa kwa Agizo,
+"Simple Python Expression, Example: territory != 'All Territories'","Usemi rahisi wa Chatu, Mfano: eneo! = &#39;Wilaya zote&#39;",
+Sales Contributions and Incentives,Michango ya Mauzo na Vivutio,
+Sourced by Supplier,Kilichohifadhiwa na Muuzaji,
+Total weightage assigned should be 100%.<br>It is {0},Uzito wote uliopewa unapaswa kuwa 100%.<br> Ni {0},
+Account {0} exists in parent company {1}.,Akaunti {0} ipo katika kampuni mama {1}.,
+"To overrule this, enable '{0}' in company {1}","Ili kutawala hii, wezesha &#39;{0}&#39; katika kampuni {1}",
+Invalid condition expression,Maneno ya batili,
+Please Select a Company First,Tafadhali Chagua Kampuni Kwanza,
+Please Select Both Company and Party Type First,Tafadhali Chagua Kampuni na Aina ya Sherehe Kwanza,
+Provide the invoice portion in percent,Toa sehemu ya ankara kwa asilimia,
+Give number of days according to prior selection,Toa idadi ya siku kulingana na uteuzi wa awali,
+Email Details,Maelezo ya Barua pepe,
+"Select a greeting for the receiver. E.g. Mr., Ms., etc.","Chagua salamu kwa mpokeaji. Mfano Bwana, Bi.",
+Preview Email,Hakiki Barua pepe,
+Please select a Supplier,Tafadhali chagua Mtoaji,
+Supplier Lead Time (days),Saa ya Kuongoza ya muuzaji (siku),
+"Home, Work, etc.","Nyumba, Kazi, n.k.",
+Exit Interview Held On,Toka Mahojiano Yaliyofanyika,
+Condition and formula,Hali na fomula,
+Sets 'Target Warehouse' in each row of the Items table.,Inaweka &#39;Ghala Lengwa&#39; katika kila safu ya jedwali la Vitu.,
+Sets 'Source Warehouse' in each row of the Items table.,Inaweka &#39;Ghala la Chanzo&#39; katika kila safu ya jedwali la Vitu.,
+POS Register,Jisajili ya POS,
+"Can not filter based on POS Profile, if grouped by POS Profile","Haiwezi kuchuja kulingana na Profaili ya POS, ikiwa imepangwa na Profaili ya POS",
+"Can not filter based on Customer, if grouped by Customer","Haiwezi kuchuja kulingana na Wateja, ikiwa imepangwa kwa Wateja",
+"Can not filter based on Cashier, if grouped by Cashier","Haiwezi kuchuja kulingana na Cashier, ikiwa imepangwa na Cashier",
+Payment Method,Njia ya malipo,
+"Can not filter based on Payment Method, if grouped by Payment Method","Haiwezi kuchuja kulingana na Njia ya Malipo, ikiwa imepangwa kwa Njia ya Malipo",
+Supplier Quotation Comparison,Ulinganishaji wa Nukuu ya Wauzaji,
+Price per Unit (Stock UOM),Bei kwa kila Kitengo (UOM ya Hisa),
+Group by Supplier,Kikundi na Muuzaji,
+Group by Item,Kikundi kwa Bidhaa,
+Remember to set {field_label}. It is required by {regulation}.,Kumbuka kuweka {field_label}. Inahitajika na {kanuni}.,
+Enrollment Date cannot be before the Start Date of the Academic Year {0},Tarehe ya Usajili haiwezi kuwa kabla ya Tarehe ya Kuanza ya Mwaka wa Mafunzo {0},
+Enrollment Date cannot be after the End Date of the Academic Term {0},Tarehe ya Kujiandikisha haiwezi kuwa baada ya Tarehe ya Mwisho ya Kipindi cha Mafunzo {0},
+Enrollment Date cannot be before the Start Date of the Academic Term {0},Tarehe ya Usajili haiwezi kuwa kabla ya Tarehe ya Kuanza ya Kipindi cha Mafunzo {0},
+Posting future transactions are not allowed due to Immutable Ledger,Kutuma shughuli za siku za usoni haziruhusiwi kwa sababu ya Leja Isiyobadilika,
+Future Posting Not Allowed,Uchapishaji wa Baadaye Hauruhusiwi,
+"To enable Capital Work in Progress Accounting, ","Kuwezesha Kazi ya Mtaji katika Uhasibu wa Maendeleo,",
+you must select Capital Work in Progress Account in accounts table,Lazima uchague Kazi ya Mtaji katika Akaunti ya Maendeleo katika jedwali la akaunti,
+You can also set default CWIP account in Company {},Unaweza pia kuweka akaunti chaguomsingi ya CWIP katika Kampuni {},
+The Request for Quotation can be accessed by clicking on the following button,Ombi la Nukuu linaweza kupatikana kwa kubonyeza kitufe kifuatacho,
+Regards,Salamu,
+Please click on the following button to set your new password,Tafadhali bonyeza kitufe kifuatacho ili kuweka nywila yako mpya,
+Update Password,Sasisha Nenosiri,
+Row #{}: Selling rate for item {} is lower than its {}. Selling {} should be atleast {},Safu mlalo # {}: Kiwango cha kuuza cha bidhaa {} ni cha chini kuliko chake {}. Uuzaji {} unapaswa kuwa mzuri {},
+You can alternatively disable selling price validation in {} to bypass this validation.,Unaweza pia kuzuia uuzaji wa uthibitishaji wa bei katika {} kupitisha uthibitishaji huu.,
+Invalid Selling Price,Bei batili ya Uuzaji,
+Address needs to be linked to a Company. Please add a row for Company in the Links table.,Anwani inahitaji kuunganishwa na Kampuni. Tafadhali ongeza safu kwa Kampuni katika jedwali la Viungo.,
+Company Not Linked,Kampuni Haijaunganishwa,
+Import Chart of Accounts from CSV / Excel files,Leta Chati ya Akaunti kutoka faili za CSV / Excel,
+Completed Qty cannot be greater than 'Qty to Manufacture',Malipo yaliyokamilika hayawezi kuwa makubwa kuliko &#39;Gharama ya Kutengeneza&#39;,
+"Row {0}: For Supplier {1}, Email Address is Required to send an email","Safu mlalo {0}: Kwa Muuzaji {1}, Anwani ya barua pepe inahitajika kutuma barua pepe",
diff --git a/erpnext/translations/ta.csv b/erpnext/translations/ta.csv
index f289156..058aaab 100644
--- a/erpnext/translations/ta.csv
+++ b/erpnext/translations/ta.csv
@@ -521,7 +521,6 @@
 Chargeble,Chargeble,
 Charges are updated in Purchase Receipt against each item,கட்டணங்கள் ஒவ்வொரு உருப்படியை எதிரான வாங்கும் ரசீது இல் புதுப்பிக்கப்பட்டது,
 "Charges will be distributed proportionately based on item qty or amount, as per your selection","கட்டணங்கள் விகிதாசாரத்தில் தேர்வு படி, உருப்படி கொத்தமல்லி அல்லது அளவு அடிப்படையில்",
-Chart Of Accounts,கணக்கு விளக்கப்படம்,
 Chart of Cost Centers,செலவு மையங்கள் விளக்கப்படம்,
 Check all,அனைத்து பாருங்கள்,
 Checkout,வெளியேறுதல்,
@@ -581,7 +580,6 @@
 Compensatory Off,இழப்பீட்டு இனிய,
 Compensatory leave request days not in valid holidays,செல்லுபடியாகும் விடுமுறை நாட்களில் இழப்பீட்டு விடுப்பு கோரிக்கை நாட்கள் இல்லை,
 Complaint,புகார்,
-Completed Qty can not be greater than 'Qty to Manufacture',அது 'அளவு உற்பத்தி செய்ய' நிறைவு அளவு அதிகமாக இருக்க முடியாது,
 Completion Date,நிறைவு நாள்,
 Computer,கணினி,
 Condition,நிபந்தனை,
@@ -2033,7 +2031,6 @@
 Please select Charge Type first,பொறுப்பு வகை முதல் தேர்வு செய்க,
 Please select Company,நிறுவனத்தின் தேர்ந்தெடுக்கவும்,
 Please select Company and Designation,"நிறுவனத்தையும், பதவியையும் தேர்ந்தெடுக்கவும்",
-Please select Company and Party Type first,முதல் நிறுவனம் மற்றும் கட்சி வகை தேர்ந்தெடுக்கவும்,
 Please select Company and Posting Date to getting entries,உள்ளீடுகளை பெறுவதற்கு கம்பெனி மற்றும் இடுகையிடும் தேதியைத் தேர்ந்தெடுக்கவும்,
 Please select Company first,முதல் நிறுவனம் தேர்ந்தெடுக்கவும்,
 Please select Completion Date for Completed Asset Maintenance Log,பூர்த்தி செய்யப்பட்ட சொத்து பராமரிப்பு பதிவுக்கான நிறைவு தேதி என்பதைத் தேர்ந்தெடுக்கவும்,
@@ -2980,7 +2977,6 @@
 The name of your company for which you are setting up this system.,நீங்கள் இந்த அமைப்பை அமைக்க இது உங்கள் நிறுவனத்தின் பெயர் .,
 The number of shares and the share numbers are inconsistent,பங்குகள் மற்றும் பங்கு எண்கள் எண்ணிக்கை சீரற்றதாக உள்ளன,
 The payment gateway account in plan {0} is different from the payment gateway account in this payment request,கட்டண கட்டண நுழைவுக் கணக்கில் {0} இந்த கட்டண வேண்டுகோளில் கட்டணம் நுழைவாயில் கணக்கிலிருந்து வேறுபட்டது,
-The request for quotation can be accessed by clicking on the following link,மேற்கோள் கோரிக்கை பின்வரும் இணைப்பை கிளிக் செய்வதன் மூலம் அணுக முடியும்,
 The selected BOMs are not for the same item,தேர்ந்தெடுக்கப்பட்ட BOM கள் அதே உருப்படியை இல்லை,
 The selected item cannot have Batch,தேர்ந்தெடுக்கப்பட்ட உருப்படியை தொகுதி முடியாது,
 The seller and the buyer cannot be the same,விற்பனையாளர் மற்றும் வாங்குபவர் அதே இருக்க முடியாது,
@@ -3130,7 +3126,6 @@
 Total flexible benefit component amount {0} should not be less than max benefits {1},முழு நெகிழ்வான பயன் தரும் அளவு {0} அதிகபட்ச நன்மைகள் விட குறைவாக இருக்கக்கூடாது {1},
 Total hours: {0},மொத்த மணிநேரம் {0},
 Total leaves allocated is mandatory for Leave Type {0},ஒதுக்கப்பட்ட மொத்த இலைகள் விடுப்பு வகைக்கு கட்டாயமாகும் {0},
-Total weightage assigned should be 100%. It is {0},ஒதுக்கப்படும் மொத்த தாக்கத்தில் 100 % இருக்க வேண்டும். இது {0},
 Total working hours should not be greater than max working hours {0},மொத்த வேலை மணி நேரம் அதிகபட்சம் வேலை நேரம் விட அதிகமாக இருக்க கூடாது {0},
 Total {0} ({1}),மொத்த {0} ({1}),
 "Total {0} for all items is zero, may be you should change 'Distribute Charges Based On'","மொத்த {0} எல்லா கோப்புகளையும் பூஜ்யம், நீங்கள் &#39;அடிப்படையாகக் கொண்டு விநியோகிக்கவும் கட்டணங்கள்&#39; மாற்ற வேண்டும் இருக்கலாம்",
@@ -3544,7 +3539,6 @@
 Company field is required,நிறுவனத்தின் புலம் தேவை,
 Creating Dimensions...,பரிமாணங்களை உருவாக்குதல் ...,
 Duplicate entry against the item code {0} and manufacturer {1},உருப்படி குறியீடு {0} மற்றும் உற்பத்தியாளர் {1 against க்கு எதிராக நகல் நுழைவு,
-Import Chart Of Accounts from CSV / Excel files,CSV / Excel கோப்புகளிலிருந்து கணக்குகளின் விளக்கப்படத்தை இறக்குமதி செய்க,
 Invalid GSTIN! The input you've entered doesn't match the GSTIN format for UIN Holders or Non-Resident OIDAR Service Providers,தவறான GSTIN! நீங்கள் உள்ளிட்ட உள்ளீடு UIN வைத்திருப்பவர்கள் அல்லது குடியுரிமை பெறாத OIDAR சேவை வழங்குநர்களுக்கான GSTIN வடிவத்துடன் பொருந்தவில்லை,
 Invoice Grand Total,விலைப்பட்டியல் கிராண்ட் மொத்தம்,
 Last carbon check date cannot be a future date,கடைசி கார்பன் சோதனை தேதி எதிர்கால தேதியாக இருக்க முடியாது,
@@ -3921,7 +3915,6 @@
 Plaid public token error,பொது டோக்கன் பிழை,
 Plaid transactions sync error,பிளேட் பரிவர்த்தனைகள் ஒத்திசைவு பிழை,
 Please check the error log for details about the import errors,இறக்குமதி பிழைகள் பற்றிய விவரங்களுக்கு பிழை பதிவை சரிபார்க்கவும்,
-Please click on the following link to set your new password,உங்கள் புதிய கடவுச்சொல்லை அமைக்க பின்வரும் இணைப்பை கிளிக் செய்யுங்கள்,
 Please create <b>DATEV Settings</b> for Company <b>{}</b>.,நிறுவனத்திற்கான <b>DATEV அமைப்புகளை</b> உருவாக்கவும் <b>}}</b> .,
 Please create adjustment Journal Entry for amount {0} ,{0 amount தொகைக்கு சரிசெய்தல் ஜர்னல் உள்ளீட்டை உருவாக்கவும்,
 Please do not create more than 500 items at a time,ஒரு நேரத்தில் 500 க்கும் மேற்பட்ட உருப்படிகளை உருவாக்க வேண்டாம்,
@@ -3997,6 +3990,7 @@
 Release date must be in the future,வெளியீட்டு தேதி எதிர்காலத்தில் இருக்க வேண்டும்,
 Relieving Date must be greater than or equal to Date of Joining,நிவாரண தேதி சேரும் தேதியை விட அதிகமாகவோ அல்லது சமமாகவோ இருக்க வேண்டும்,
 Rename,மறுபெயரிடு,
+Rename Not Allowed,மறுபெயரிட அனுமதிக்கப்படவில்லை,
 Repayment Method is mandatory for term loans,கால கடன்களுக்கு திருப்பிச் செலுத்தும் முறை கட்டாயமாகும்,
 Repayment Start Date is mandatory for term loans,கால கடன்களுக்கு திருப்பிச் செலுத்தும் தொடக்க தேதி கட்டாயமாகும்,
 Report Item,உருப்படியைப் புகாரளி,
@@ -4043,7 +4037,6 @@
 Select All,அனைத்து தேர்வு,
 Select Difference Account,வேறுபாடு கணக்கைத் தேர்ந்தெடுக்கவும்,
 Select a Default Priority.,இயல்புநிலை முன்னுரிமையைத் தேர்ந்தெடுக்கவும்.,
-Select a Supplier from the Default Supplier List of the items below.,கீழே உள்ள பொருட்களின் இயல்புநிலை சப்ளையர் பட்டியலிலிருந்து ஒரு சப்ளையரைத் தேர்ந்தெடுக்கவும்.,
 Select a company,ஒரு நிறுவனத்தைத் தேர்ந்தெடுக்கவும்,
 Select finance book for the item {0} at row {1},{1 row வரிசையில் {0 item உருப்படிக்கு நிதி புத்தகத்தைத் தேர்ந்தெடுக்கவும்,
 Select only one Priority as Default.,இயல்புநிலையாக ஒரே ஒரு முன்னுரிமையைத் தேர்ந்தெடுக்கவும்.,
@@ -4247,7 +4240,6 @@
 Actual ,உண்மையான,
 Add to cart,வணிக வண்டியில் சேர்,
 Budget,வரவு செலவு திட்டம்,
-Chart Of Accounts Importer,கணக்குகள் இறக்குமதியாளர் விளக்கப்படம்,
 Chart of Accounts,கணக்குகளின் விளக்கப்படம்,
 Customer database.,வாடிக்கையாளர் தரவுத்தளம்.,
 Days Since Last order,கடந்த சில நாட்களாக கடைசி ஆர்டர்,
@@ -4546,7 +4538,6 @@
 Check Supplier Invoice Number Uniqueness,காசோலை சப்ளையர் விலைப்பட்டியல் எண் தனித்துவம்,
 Make Payment via Journal Entry,பத்திரிகை நுழைவு வழியாக பணம் செலுத்து,
 Unlink Payment on Cancellation of Invoice,விலைப்பட்டியல் ரத்து கட்டணங்களை செலுத்தும் இணைப்பகற்றம்,
-Unlink Advance Payment on Cancelation of Order,ஆர்டரை ரத்து செய்வதற்கான முன்கூட்டியே கொடுப்பனவை நீக்கு,
 Book Asset Depreciation Entry Automatically,புத்தக சொத்து தேய்மானம் நுழைவு தானாகவே,
 Automatically Add Taxes and Charges from Item Tax Template,பொருள் வரி வார்ப்புருவில் இருந்து வரிகளையும் கட்டணங்களையும் தானாக சேர்க்கவும்,
 Automatically Fetch Payment Terms,கட்டண விதிமுறைகளை தானாகவே பெறுங்கள்,
@@ -4940,7 +4931,6 @@
 POS Customer Group,பிஓஎஸ் வாடிக்கையாளர் குழு,
 POS Field,பிஓஎஸ் புலம்,
 POS Item Group,பிஓஎஸ் பொருள் குழு,
-[Select],[ தேர்ந்தெடு ],
 Company Address,நிறுவன முகவரி,
 Update Stock,பங்கு புதுப்பிக்க,
 Ignore Pricing Rule,விலை விதி புறக்கணிக்க,
@@ -6481,7 +6471,6 @@
 Appraisal Template,மதிப்பீட்டு வார்ப்புரு,
 For Employee Name,பணியாளர் பெயர்,
 Goals,இலக்குகளை,
-Calculate Total Score,மொத்த மதிப்பெண் கணக்கிட,
 Total Score (Out of 5),மொத்த மதிப்பெண் (5 அவுட்),
 "Any other remarks, noteworthy effort that should go in the records.","வேறு எந்த கருத்துக்கள், பதிவுகள் செல்ல வேண்டும் என்று குறிப்பிடத்தக்கது முயற்சியாகும்.",
 Appraisal Goal,மதிப்பீட்டு இலக்கு,
@@ -6599,11 +6588,6 @@
 Reason for Leaving,விட்டு காரணம்,
 Leave Encashed?,காசாக்கப்பட்டால் விட்டு?,
 Encashment Date,பணமாக்கல் தேதி,
-Exit Interview Details,பேட்டி விவரம் வெளியேற,
-Held On,அன்று நடைபெற்ற,
-Reason for Resignation,ராஜினாமாவுக்கான காரணம்,
-Better Prospects,நல்ல வாய்ப்புகள்,
-Health Concerns,சுகாதார கவலைகள்,
 New Workplace,புதிய பணியிடத்தை,
 HR-EAD-.YYYY.-,மனிதவள-EAD-.YYYY.-,
 Returned Amount,திரும்பிய தொகை,
@@ -8239,9 +8223,6 @@
 Manufacturers used in Items,பொருட்கள் பயன்படுத்தப்படும் உற்பத்தியாளர்கள்,
 Limited to 12 characters,12 எழுத்துக்கள் மட்டுமே,
 MAT-MR-.YYYY.-,MAT-எம்-.YYYY.-,
-Set Warehouse,கிடங்கை அமைக்கவும்,
-Sets 'For Warehouse' in each row of the Items table.,உருப்படிகள் அட்டவணையின் ஒவ்வொரு வரிசையிலும் &#39;கிடங்கிற்காக&#39; அமைக்கிறது.,
-Requested For,கோரப்பட்ட,
 Partially Ordered,ஓரளவு உத்தரவிட்டது,
 Transferred,மாற்றப்பட்டது,
 % Ordered,% உத்தரவிட்டார்,
@@ -8690,8 +8671,6 @@
 Select warehouse for material requests,பொருள் கோரிக்கைகளுக்கு கிடங்கைத் தேர்ந்தெடுக்கவும்,
 Transfer Materials For Warehouse {0},கிடங்கிற்கான பொருட்களை மாற்றவும் {0},
 Production Plan Material Request Warehouse,உற்பத்தித் திட்டம் பொருள் கோரிக்கை கிடங்கு,
-Set From Warehouse,கிடங்கிலிருந்து அமைக்கவும்,
-Source Warehouse (Material Transfer),மூல கிடங்கு (பொருள் பரிமாற்றம்),
 Sets 'Source Warehouse' in each row of the items table.,உருப்படிகளின் அட்டவணையின் ஒவ்வொரு வரிசையிலும் &#39;மூல கிடங்கு&#39; அமைக்கிறது.,
 Sets 'Target Warehouse' in each row of the items table.,உருப்படிகளின் அட்டவணையின் ஒவ்வொரு வரிசையிலும் &#39;இலக்கு கிடங்கு&#39; அமைக்கிறது.,
 Show Cancelled Entries,ரத்து செய்யப்பட்ட உள்ளீடுகளைக் காட்டு,
@@ -9157,7 +9136,6 @@
 Is Income Tax Component,வருமான வரி கூறு ஆகும்,
 Component properties and references ,உபகரண பண்புகள் மற்றும் குறிப்புகள்,
 Additional Salary ,கூடுதல் சம்பளம்,
-Condtion and formula,நிபந்தனை மற்றும் சூத்திரம்,
 Unmarked days,குறிக்கப்படாத நாட்கள்,
 Absent Days,இல்லாத நாட்கள்,
 Conditions and Formula variable and example,நிபந்தனைகள் மற்றும் ஃபார்முலா மாறி மற்றும் எடுத்துக்காட்டு,
@@ -9444,7 +9422,6 @@
 Please check your Plaid client ID and secret values,உங்கள் பிளேட் கிளையன்ட் ஐடி மற்றும் ரகசிய மதிப்புகளை சரிபார்க்கவும்,
 Bank transaction creation error,வங்கி பரிவர்த்தனை உருவாக்கும் பிழை,
 Unit of Measurement,அளவீட்டு அலகு,
-Row #{}: Selling rate for item {} is lower than its {}. Selling rate should be atleast {},வரிசை # {}: item item உருப்படியின் விற்பனை வீதம் அதன் than than ஐ விட குறைவாக உள்ளது. விற்பனை விகிதம் குறைந்தபட்சம் இருக்க வேண்டும் {},
 Fiscal Year {0} Does Not Exist,நிதியாண்டு {0 Ex இருக்காது,
 Row # {0}: Returned Item {1} does not exist in {2} {3},வரிசை # {0}: திரும்பிய பொருள் {1} {2} {3 in இல் இல்லை,
 Valuation type charges can not be marked as Inclusive,மதிப்பீட்டு வகை கட்டணங்களை உள்ளடக்கியதாக குறிக்க முடியாது,
@@ -9598,8 +9575,60 @@
 Response Time for {0} priority in row {1} can't be greater than Resolution Time.,{1 row வரிசையில் {0} முன்னுரிமைக்கான மறுமொழி நேரம் தீர்மான நேரத்தை விட அதிகமாக இருக்க முடியாது.,
 {0} is not enabled in {1},{0 in {1 in இல் இயக்கப்படவில்லை,
 Group by Material Request,பொருள் கோரிக்கை மூலம் குழு,
-"Row {0}: For Supplier {0}, Email Address is Required to Send Email","வரிசை {0}: சப்ளையருக்கு {0}, மின்னஞ்சல் அனுப்ப மின்னஞ்சல் முகவரி தேவை",
 Email Sent to Supplier {0},மின்னஞ்சல் சப்ளையருக்கு அனுப்பப்பட்டது {0},
 "The Access to Request for Quotation From Portal is Disabled. To Allow Access, Enable it in Portal Settings.","போர்ட்டலில் இருந்து மேற்கோள் கோருவதற்கான அணுகல் முடக்கப்பட்டுள்ளது. அணுகலை அனுமதிக்க, அதை போர்டல் அமைப்புகளில் இயக்கு.",
 Supplier Quotation {0} Created,சப்ளையர் மேற்கோள் {0} உருவாக்கப்பட்டது,
 Valid till Date cannot be before Transaction Date,பரிவர்த்தனை தேதிக்கு முன் தேதி வரை செல்லுபடியாகாது,
+Unlink Advance Payment on Cancellation of Order,ஆர்டரை ரத்து செய்வதற்கான முன்கூட்டியே கொடுப்பனவை நீக்கு,
+"Simple Python Expression, Example: territory != 'All Territories'","எளிய பைதான் வெளிப்பாடு, எடுத்துக்காட்டு: பிரதேசம்! = &#39;அனைத்து பிரதேசங்களும்&#39;",
+Sales Contributions and Incentives,விற்பனை பங்களிப்புகள் மற்றும் சலுகைகள்,
+Sourced by Supplier,சப்ளையர் மூலமாக,
+Total weightage assigned should be 100%.<br>It is {0},ஒதுக்கப்பட்ட மொத்த வெயிட்டேஜ் 100% ஆக இருக்க வேண்டும்.<br> இது {0},
+Account {0} exists in parent company {1}.,பெற்றோர் நிறுவனமான {1 in இல் கணக்கு {0} உள்ளது.,
+"To overrule this, enable '{0}' in company {1}","இதை மீற, company {company நிறுவனத்தில் &#39;{0}&#39; ஐ இயக்கவும்",
+Invalid condition expression,தவறான நிலை வெளிப்பாடு,
+Please Select a Company First,முதலில் ஒரு நிறுவனத்தைத் தேர்ந்தெடுக்கவும்,
+Please Select Both Company and Party Type First,முதலில் நிறுவனம் மற்றும் கட்சி வகை இரண்டையும் தேர்ந்தெடுக்கவும்,
+Provide the invoice portion in percent,விலைப்பட்டியல் பகுதியை சதவீதமாக வழங்கவும்,
+Give number of days according to prior selection,முந்தைய தேர்வுக்கு ஏற்ப நாட்கள் கொடுங்கள்,
+Email Details,மின்னஞ்சல் விவரங்கள்,
+"Select a greeting for the receiver. E.g. Mr., Ms., etc.","பெறுநருக்கு வாழ்த்து ஒன்றைத் தேர்ந்தெடுக்கவும். எ.கா திரு, செல்வி, முதலியன.",
+Preview Email,மின்னோட்டத்தை முன்னோட்டமிடுங்கள்,
+Please select a Supplier,ஒரு சப்ளையரைத் தேர்ந்தெடுக்கவும்,
+Supplier Lead Time (days),சப்ளையர் முன்னணி நேரம் (நாட்கள்),
+"Home, Work, etc.","வீடு, வேலை போன்றவை.",
+Exit Interview Held On,வெளியேறும் நேர்காணல் நடைபெற்றது,
+Condition and formula,நிபந்தனை மற்றும் சூத்திரம்,
+Sets 'Target Warehouse' in each row of the Items table.,உருப்படிகள் அட்டவணையின் ஒவ்வொரு வரிசையிலும் &#39;இலக்கு கிடங்கு&#39; அமைக்கிறது.,
+Sets 'Source Warehouse' in each row of the Items table.,உருப்படிகள் அட்டவணையின் ஒவ்வொரு வரிசையிலும் &#39;மூல கிடங்கு&#39; அமைக்கிறது.,
+POS Register,பிஓஎஸ் பதிவு,
+"Can not filter based on POS Profile, if grouped by POS Profile","POS சுயவிவரத்தால் தொகுக்கப்பட்டால், POS சுயவிவரத்தின் அடிப்படையில் வடிகட்ட முடியாது",
+"Can not filter based on Customer, if grouped by Customer","வாடிக்கையாளரால் குழுவாக இருந்தால், வாடிக்கையாளரை அடிப்படையாகக் கொண்டு வடிகட்ட முடியாது",
+"Can not filter based on Cashier, if grouped by Cashier","காசாளரால் தொகுக்கப்பட்டால், காசாளரின் அடிப்படையில் வடிகட்ட முடியாது",
+Payment Method,கட்டணம் செலுத்தும் முறை,
+"Can not filter based on Payment Method, if grouped by Payment Method","கொடுப்பனவு முறையால் தொகுக்கப்பட்டால், கட்டண முறையின் அடிப்படையில் வடிகட்ட முடியாது",
+Supplier Quotation Comparison,சப்ளையர் மேற்கோள் ஒப்பீடு,
+Price per Unit (Stock UOM),ஒரு யூனிட்டுக்கு விலை (பங்கு UOM),
+Group by Supplier,சப்ளையர் குழு,
+Group by Item,உருப்படி மூலம் குழு,
+Remember to set {field_label}. It is required by {regulation}.,{Field_label set ஐ அமைக்க நினைவில் கொள்க. இது {ஒழுங்குமுறை by மூலம் தேவைப்படுகிறது.,
+Enrollment Date cannot be before the Start Date of the Academic Year {0},சேர்க்கை தேதி கல்வி ஆண்டின் தொடக்க தேதிக்கு முன்பு இருக்கக்கூடாது {0},
+Enrollment Date cannot be after the End Date of the Academic Term {0},சேர்க்கை தேதி கல்விக் காலத்தின் இறுதி தேதிக்குப் பிறகு இருக்க முடியாது {0},
+Enrollment Date cannot be before the Start Date of the Academic Term {0},சேர்க்கை தேதி கல்வி காலத்தின் தொடக்க தேதிக்கு முன்பு இருக்கக்கூடாது {0},
+Posting future transactions are not allowed due to Immutable Ledger,மாற்ற முடியாத லெட்ஜர் காரணமாக எதிர்கால பரிவர்த்தனைகளை இடுகையிடுவது அனுமதிக்கப்படாது,
+Future Posting Not Allowed,எதிர்கால இடுகை அனுமதிக்கப்படவில்லை,
+"To enable Capital Work in Progress Accounting, ","முன்னேற்ற கணக்கியலில் மூலதன வேலையை இயக்க,",
+you must select Capital Work in Progress Account in accounts table,கணக்கு அட்டவணையில் முன்னேற்ற கணக்கில் மூலதன வேலை என்பதை நீங்கள் தேர்ந்தெடுக்க வேண்டும்,
+You can also set default CWIP account in Company {},நிறுவனத்தில் default default இயல்புநிலை CWIP கணக்கையும் அமைக்கலாம்,
+The Request for Quotation can be accessed by clicking on the following button,பின்வரும் பொத்தானைக் கிளிக் செய்வதன் மூலம் மேற்கோள் கோரிக்கையை அணுகலாம்,
+Regards,அன்புடன்,
+Please click on the following button to set your new password,உங்கள் புதிய கடவுச்சொல்லை அமைக்க பின்வரும் பொத்தானைக் கிளிக் செய்க,
+Update Password,கடவுச்சொல்லைப் புதுப்பிக்கவும்,
+Row #{}: Selling rate for item {} is lower than its {}. Selling {} should be atleast {},வரிசை # {}: item item உருப்படியின் விற்பனை வீதம் அதன் than than ஐ விட குறைவாக உள்ளது. {} விற்க குறைந்தபட்சம் இருக்க வேண்டும் {},
+You can alternatively disable selling price validation in {} to bypass this validation.,இந்த சரிபார்ப்பைத் தவிர்ப்பதற்கு {in இல் விற்பனை விலை சரிபார்ப்பை மாற்றலாம்.,
+Invalid Selling Price,தவறான விற்பனை விலை,
+Address needs to be linked to a Company. Please add a row for Company in the Links table.,முகவரியை ஒரு நிறுவனத்துடன் இணைக்க வேண்டும். இணைப்புகள் அட்டவணையில் நிறுவனத்திற்கான ஒரு வரிசையைச் சேர்க்கவும்.,
+Company Not Linked,நிறுவனம் இணைக்கப்படவில்லை,
+Import Chart of Accounts from CSV / Excel files,CSV / Excel கோப்புகளிலிருந்து கணக்குகளின் இறக்குமதி,
+Completed Qty cannot be greater than 'Qty to Manufacture',பூர்த்தி செய்யப்பட்ட Qty &#39;Qty to Manufacture&#39; ஐ விட அதிகமாக இருக்க முடியாது,
+"Row {0}: For Supplier {1}, Email Address is Required to send an email","வரிசை {0}: சப்ளையர் {1 For க்கு, மின்னஞ்சல் அனுப்ப மின்னஞ்சல் முகவரி தேவை",
diff --git a/erpnext/translations/te.csv b/erpnext/translations/te.csv
index ed3c2ff..6ae7413 100644
--- a/erpnext/translations/te.csv
+++ b/erpnext/translations/te.csv
@@ -521,7 +521,6 @@
 Chargeble,Chargeble,
 Charges are updated in Purchase Receipt against each item,ఆరోపణలు ప్రతి అంశం వ్యతిరేకంగా కొనుగోలు రసీదులు లో నవీకరించబడింది ఉంటాయి,
 "Charges will be distributed proportionately based on item qty or amount, as per your selection","ఆరోపణలు ఎంత మీ ఎంపిక ప్రకారం, అంశం అంశాల లేదా మొత్తం ఆధారంగా పంపిణీ చేయబడుతుంది",
-Chart Of Accounts,ఖాతాల చార్ట్,
 Chart of Cost Centers,ఖర్చు కేంద్రాలు చార్ట్,
 Check all,అన్ని తనిఖీ,
 Checkout,హోటల్ నుంచి బయటకు వెళ్లడం,
@@ -581,7 +580,6 @@
 Compensatory Off,పరిహారం ఆఫ్,
 Compensatory leave request days not in valid holidays,చెల్లుబాటు అయ్యే సెలవుదినాల్లో కాంపెన్సేటరీ లీవ్ అభ్యర్థన రోజుల లేదు,
 Complaint,ఫిర్యాదు,
-Completed Qty can not be greater than 'Qty to Manufacture',కంటే &#39;ప్యాక్ చేసిన అంశాల తయారీకి&#39; పూర్తి ప్యాక్ చేసిన అంశాల ఎక్కువ ఉండకూడదు,
 Completion Date,పూర్తిచేసే తేదీ,
 Computer,కంప్యూటర్,
 Condition,కండిషన్,
@@ -2033,7 +2031,6 @@
 Please select Charge Type first,మొదటి ఛార్జ్ రకాన్ని ఎంచుకోండి,
 Please select Company,కంపెనీ దయచేసి ఎంచుకోండి,
 Please select Company and Designation,దయచేసి కంపెనీ మరియు హోదాను ఎంచుకోండి,
-Please select Company and Party Type first,మొదటి కంపెనీ మరియు పార్టీ రకాన్ని ఎంచుకోండి,
 Please select Company and Posting Date to getting entries,దయచేసి ఎంట్రీలను పొందడానికి కంపెనీని మరియు పోస్ట్ తేదీని ఎంచుకోండి,
 Please select Company first,మొదటి కంపెనీ దయచేసి ఎంచుకోండి,
 Please select Completion Date for Completed Asset Maintenance Log,పూర్తి చేసిన ఆస్తి నిర్వహణ లాగ్ కోసం పూర్తి తేదీని దయచేసి ఎంచుకోండి,
@@ -2980,7 +2977,6 @@
 The name of your company for which you are setting up this system.,మీ కంపెనీ పేరు ఇది కోసం మీరు ఈ వ్యవస్థ ఏర్పాటు.,
 The number of shares and the share numbers are inconsistent,వాటాల సంఖ్య మరియు షేర్ నంబర్లు అస్థిరమైనవి,
 The payment gateway account in plan {0} is different from the payment gateway account in this payment request,ఈ చెల్లింపు అభ్యర్థనలో చెల్లింపు గేట్వే ఖాతా నుండి చెల్లింపు గేట్వే ఖాతా {0} భిన్నంగా ఉంటుంది,
-The request for quotation can be accessed by clicking on the following link,క్రింది లింక్ పై క్లిక్ చేసి కొటేషన్ కోసం అభ్యర్థన ప్రాప్తి చేయవచ్చు,
 The selected BOMs are not for the same item,ఎంపిక BOMs అదే అంశం కోసం కాదు,
 The selected item cannot have Batch,ఎంచుకున్న అంశం బ్యాచ్ ఉండకూడదు,
 The seller and the buyer cannot be the same,విక్రేత మరియు కొనుగోలుదారు ఒకే విధంగా ఉండకూడదు,
@@ -3130,7 +3126,6 @@
 Total flexible benefit component amount {0} should not be less than max benefits {1},మొత్తం సౌకర్యవంతమైన ప్రయోజనం భాగం మొత్తం {0} మాక్స్ ప్రయోజనాలు కంటే తక్కువగా ఉండకూడదు {1},
 Total hours: {0},మొత్తం గంటలు: {0},
 Total leaves allocated is mandatory for Leave Type {0},కేటాయించిన మొత్తం ఆకులు లీవ్ టైప్ {0} కోసం తప్పనిసరి,
-Total weightage assigned should be 100%. It is {0},100% ఉండాలి కేటాయించిన మొత్తం వెయిటేజీ. ఇది {0},
 Total working hours should not be greater than max working hours {0},మొత్తం పని గంటల గరిష్టంగా పని గంటల కంటే ఎక్కువ ఉండకూడదు {0},
 Total {0} ({1}),మొత్తం {0} ({1}),
 "Total {0} for all items is zero, may be you should change 'Distribute Charges Based On'","మొత్తం {0} అన్ని అంశాలను, సున్నా మీరు &#39;ఆధారంగా ఛార్జీలు పంపిణీ&#39; మార్చాలి ఉండవచ్చు",
@@ -3544,7 +3539,6 @@
 Company field is required,కంపెనీ ఫీల్డ్ అవసరం,
 Creating Dimensions...,కొలతలు సృష్టిస్తోంది ...,
 Duplicate entry against the item code {0} and manufacturer {1},అంశం కోడ్ {0} మరియు తయారీదారు {1} వ్యతిరేకంగా నకిలీ నమోదు,
-Import Chart Of Accounts from CSV / Excel files,CSV / Excel ఫైళ్ళ నుండి ఖాతాల చార్ట్ను దిగుమతి చేయండి,
 Invalid GSTIN! The input you've entered doesn't match the GSTIN format for UIN Holders or Non-Resident OIDAR Service Providers,చెల్లని GSTIN! మీరు నమోదు చేసిన ఇన్పుట్ UIN హోల్డర్స్ లేదా నాన్-రెసిడెంట్ OIDAR సర్వీస్ ప్రొవైడర్ల కోసం GSTIN ఆకృతితో సరిపోలడం లేదు,
 Invoice Grand Total,ఇన్వాయిస్ గ్రాండ్ టోటల్,
 Last carbon check date cannot be a future date,చివరి కార్బన్ చెక్ తేదీ భవిష్యత్ తేదీ కాదు,
@@ -3921,7 +3915,6 @@
 Plaid public token error,పబ్లిక్ టోకెన్ లోపం,
 Plaid transactions sync error,ప్లాయిడ్ లావాదేవీలు సమకాలీకరణ లోపం,
 Please check the error log for details about the import errors,దిగుమతి లోపాల గురించి వివరాల కోసం దయచేసి లోపం లాగ్‌ను తనిఖీ చేయండి,
-Please click on the following link to set your new password,మీ కొత్త పాస్వర్డ్ను సెట్ క్రింది లింక్పై క్లిక్ చేయండి,
 Please create <b>DATEV Settings</b> for Company <b>{}</b>.,దయచేసి కంపెనీ కోసం <b>DATE DETV సెట్టింగులను</b> సృష్టించండి <b>}}</b> .,
 Please create adjustment Journal Entry for amount {0} ,మొత్తం for 0 for కోసం సర్దుబాటు జర్నల్ ఎంట్రీని సృష్టించండి,
 Please do not create more than 500 items at a time,దయచేసి ఒకేసారి 500 కంటే ఎక్కువ అంశాలను సృష్టించవద్దు,
@@ -3997,6 +3990,7 @@
 Release date must be in the future,విడుదల తేదీ భవిష్యత్తులో ఉండాలి,
 Relieving Date must be greater than or equal to Date of Joining,ఉపశమన తేదీ చేరిన తేదీ కంటే ఎక్కువ లేదా సమానంగా ఉండాలి,
 Rename,పేరుమార్చు,
+Rename Not Allowed,పేరు మార్చడం అనుమతించబడలేదు,
 Repayment Method is mandatory for term loans,టర్మ్ లోన్లకు తిరిగి చెల్లించే విధానం తప్పనిసరి,
 Repayment Start Date is mandatory for term loans,టర్మ్ లోన్లకు తిరిగి చెల్లించే ప్రారంభ తేదీ తప్పనిసరి,
 Report Item,అంశాన్ని నివేదించండి,
@@ -4043,7 +4037,6 @@
 Select All,అన్ని ఎంచుకోండి,
 Select Difference Account,తేడా ఖాతాను ఎంచుకోండి,
 Select a Default Priority.,డిఫాల్ట్ ప్రాధాన్యతను ఎంచుకోండి.,
-Select a Supplier from the Default Supplier List of the items below.,దిగువ అంశాల డిఫాల్ట్ సరఫరాదారు జాబితా నుండి సరఫరాదారుని ఎంచుకోండి.,
 Select a company,ఒక సంస్థను ఎంచుకోండి,
 Select finance book for the item {0} at row {1},{1 row వరుసలో {0 item అంశం కోసం ఫైనాన్స్ పుస్తకాన్ని ఎంచుకోండి,
 Select only one Priority as Default.,డిఫాల్ట్‌గా ఒకే ప్రాధాన్యతను ఎంచుకోండి.,
@@ -4247,7 +4240,6 @@
 Actual ,వాస్తవ,
 Add to cart,కార్ట్ జోడించు,
 Budget,బడ్జెట్,
-Chart Of Accounts Importer,చార్ట్ ఆఫ్ అకౌంట్స్ దిగుమతిదారు,
 Chart of Accounts,ఖాతాల చార్ట్,
 Customer database.,కస్టమర్ డేటాబేస్.,
 Days Since Last order,చివరి ఆర్డర్ నుండి రోజుల్లో,
@@ -4546,7 +4538,6 @@
 Check Supplier Invoice Number Uniqueness,పరిశీలించడం సరఫరాదారు వాయిస్ సంఖ్య ప్రత్యేకత,
 Make Payment via Journal Entry,జర్నల్ ఎంట్రీ ద్వారా చెల్లింపు చేయండి,
 Unlink Payment on Cancellation of Invoice,వాయిస్ రద్దు చెల్లింపు లింక్ను రద్దు,
-Unlink Advance Payment on Cancelation of Order,ఆర్డర్ రద్దుపై అడ్వాన్స్ చెల్లింపును అన్‌లింక్ చేయండి,
 Book Asset Depreciation Entry Automatically,బుక్ అసెట్ అరుగుదల ఎంట్రీ స్వయంచాలకంగా,
 Automatically Add Taxes and Charges from Item Tax Template,అంశం పన్ను మూస నుండి పన్నులు మరియు ఛార్జీలను స్వయంచాలకంగా జోడించండి,
 Automatically Fetch Payment Terms,చెల్లింపు నిబంధనలను స్వయంచాలకంగా పొందండి,
@@ -4940,7 +4931,6 @@
 POS Customer Group,POS కస్టమర్ గ్రూప్,
 POS Field,POS ఫీల్డ్,
 POS Item Group,POS అంశం గ్రూప్,
-[Select],[ఎంచుకోండి],
 Company Address,సంస్థ చిరునామా,
 Update Stock,నవీకరణ స్టాక్,
 Ignore Pricing Rule,ధర రూల్ విస్మరించు,
@@ -6481,7 +6471,6 @@
 Appraisal Template,అప్రైసల్ మూస,
 For Employee Name,ఉద్యోగి పేరు కోసం,
 Goals,లక్ష్యాలు,
-Calculate Total Score,మొత్తం స్కోరు లెక్కించు,
 Total Score (Out of 5),(5) మొత్తం స్కోరు,
 "Any other remarks, noteworthy effort that should go in the records.",ఏ ఇతర స్టర్ రికార్డులలో వెళ్ళాలి అని చెప్పుకోదగిన ప్రయత్నం.,
 Appraisal Goal,అప్రైసల్ గోల్,
@@ -6599,11 +6588,6 @@
 Reason for Leaving,వదలి వెళ్ళుటకు కారణాలు,
 Leave Encashed?,Encashed వదిలి?,
 Encashment Date,ఎన్క్యాష్మెంట్ తేదీ,
-Exit Interview Details,ఇంటర్వ్యూ నిష్క్రమించు వివరాలు,
-Held On,హెల్డ్ న,
-Reason for Resignation,రాజీనామా కారణం,
-Better Prospects,మెరుగైన అవకాశాలు,
-Health Concerns,ఆరోగ్య కారణాల,
 New Workplace,కొత్త కార్యాలయంలో,
 HR-EAD-.YYYY.-,ఆర్ EAD-.YYYY.-,
 Returned Amount,తిరిగి వచ్చిన మొత్తం,
@@ -8239,9 +8223,6 @@
 Manufacturers used in Items,వాడబడేది తయారీదారులు,
 Limited to 12 characters,12 అక్షరాలకు పరిమితం,
 MAT-MR-.YYYY.-,MAT-MR-.YYYY.-,
-Set Warehouse,గిడ్డంగిని సెట్ చేయండి,
-Sets 'For Warehouse' in each row of the Items table.,ఐటమ్స్ టేబుల్ యొక్క ప్రతి వరుసలో &#39;ఫర్ వేర్‌హౌస్&#39; సెట్ చేస్తుంది.,
-Requested For,కోసం అభ్యర్థించిన,
 Partially Ordered,పాక్షికంగా ఆదేశించబడింది,
 Transferred,బదిలీ,
 % Ordered,% క్రమ,
@@ -8690,8 +8671,6 @@
 Select warehouse for material requests,మెటీరియల్ అభ్యర్థనల కోసం గిడ్డంగిని ఎంచుకోండి,
 Transfer Materials For Warehouse {0},గిడ్డంగి కోసం పదార్థాలను బదిలీ చేయండి {0},
 Production Plan Material Request Warehouse,ఉత్పత్తి ప్రణాళిక మెటీరియల్ అభ్యర్థన గిడ్డంగి,
-Set From Warehouse,గిడ్డంగి నుండి సెట్,
-Source Warehouse (Material Transfer),మూల గిడ్డంగి (మెటీరియల్ బదిలీ),
 Sets 'Source Warehouse' in each row of the items table.,అంశాల పట్టికలోని ప్రతి వరుసలో &#39;సోర్స్ వేర్‌హౌస్&#39; సెట్ చేస్తుంది.,
 Sets 'Target Warehouse' in each row of the items table.,అంశాల పట్టికలోని ప్రతి వరుసలో &#39;టార్గెట్ వేర్‌హౌస్&#39; సెట్ చేస్తుంది.,
 Show Cancelled Entries,రద్దు చేసిన ఎంట్రీలను చూపించు,
@@ -9157,7 +9136,6 @@
 Is Income Tax Component,ఆదాయపు పన్ను భాగం,
 Component properties and references ,కాంపోనెంట్ లక్షణాలు మరియు సూచనలు,
 Additional Salary ,అదనపు జీతం,
-Condtion and formula,పరిస్థితి మరియు సూత్రం,
 Unmarked days,గుర్తు తెలియని రోజులు,
 Absent Days,లేని రోజులు,
 Conditions and Formula variable and example,షరతులు మరియు ఫార్ములా వేరియబుల్ మరియు ఉదాహరణ,
@@ -9444,7 +9422,6 @@
 Please check your Plaid client ID and secret values,దయచేసి మీ ప్లాయిడ్ క్లయింట్ ID మరియు రహస్య విలువలను తనిఖీ చేయండి,
 Bank transaction creation error,బ్యాంక్ లావాదేవీల సృష్టి లోపం,
 Unit of Measurement,కొలత యూనిట్,
-Row #{}: Selling rate for item {} is lower than its {}. Selling rate should be atleast {},అడ్డు వరుస # {}: item item అంశం అమ్మకం రేటు దాని than than కన్నా తక్కువ. అమ్మకం రేటు కనీసం ఉండాలి}},
 Fiscal Year {0} Does Not Exist,ఆర్థిక సంవత్సరం {0 Ex ఉనికిలో లేదు,
 Row # {0}: Returned Item {1} does not exist in {2} {3},అడ్డు వరుస # {0}: తిరిగి వచ్చిన అంశం {1} {2} {3 in లో లేదు,
 Valuation type charges can not be marked as Inclusive,వాల్యుయేషన్ రకం ఛార్జీలు కలుపుకొని ఉన్నట్లు గుర్తించబడవు,
@@ -9598,8 +9575,60 @@
 Response Time for {0} priority in row {1} can't be greater than Resolution Time.,{1 row వరుసలో {0} ప్రాధాన్యత కోసం ప్రతిస్పందన సమయం రిజల్యూషన్ సమయం కంటే ఎక్కువగా ఉండకూడదు.,
 {0} is not enabled in {1},{0 in {1 in లో ప్రారంభించబడలేదు,
 Group by Material Request,మెటీరియల్ అభ్యర్థన ద్వారా సమూహం,
-"Row {0}: For Supplier {0}, Email Address is Required to Send Email","{0 row వరుస: సరఫరాదారు {0 For కోసం, ఇమెయిల్ పంపడానికి ఇమెయిల్ చిరునామా అవసరం",
 Email Sent to Supplier {0},ఇమెయిల్ సరఫరాదారుకు పంపబడింది {0},
 "The Access to Request for Quotation From Portal is Disabled. To Allow Access, Enable it in Portal Settings.","పోర్టల్ నుండి కొటేషన్ కోసం అభ్యర్థన యాక్సెస్ నిలిపివేయబడింది. ప్రాప్యతను అనుమతించడానికి, పోర్టల్ సెట్టింగులలో దీన్ని ప్రారంభించండి.",
 Supplier Quotation {0} Created,సరఫరాదారు కొటేషన్ {0} సృష్టించబడింది,
 Valid till Date cannot be before Transaction Date,లావాదేవీ తేదీకి ముందు తేదీ వరకు చెల్లుబాటు కాదు,
+Unlink Advance Payment on Cancellation of Order,ఆర్డర్ రద్దుపై అడ్వాన్స్ చెల్లింపును అన్‌లింక్ చేయండి,
+"Simple Python Expression, Example: territory != 'All Territories'","సాధారణ పైథాన్ వ్యక్తీకరణ, ఉదాహరణ: భూభాగం! = &#39;అన్ని భూభాగాలు&#39;",
+Sales Contributions and Incentives,అమ్మకాల రచనలు మరియు ప్రోత్సాహకాలు,
+Sourced by Supplier,సరఫరాదారుచే సోర్స్ చేయబడింది,
+Total weightage assigned should be 100%.<br>It is {0},కేటాయించిన మొత్తం వెయిటేజ్ 100% ఉండాలి.<br> ఇది {0},
+Account {0} exists in parent company {1}.,మాతృ సంస్థ {1 in లో ఖాతా {0} ఉంది.,
+"To overrule this, enable '{0}' in company {1}","దీన్ని అధిగమించడానికి, కంపెనీ {1 in లో &#39;{0}&#39; ను ప్రారంభించండి",
+Invalid condition expression,పరిస్థితి వ్యక్తీకరణ చెల్లదు,
+Please Select a Company First,దయచేసి మొదట కంపెనీని ఎంచుకోండి,
+Please Select Both Company and Party Type First,మొదట కంపెనీ మరియు పార్టీ రకం రెండింటినీ ఎంచుకోండి,
+Provide the invoice portion in percent,ఇన్వాయిస్ భాగాన్ని శాతంలో అందించండి,
+Give number of days according to prior selection,ముందస్తు ఎంపిక ప్రకారం రోజుల సంఖ్య ఇవ్వండి,
+Email Details,ఇమెయిల్ వివరాలు,
+"Select a greeting for the receiver. E.g. Mr., Ms., etc.","రిసీవర్ కోసం గ్రీటింగ్ ఎంచుకోండి. ఉదా మిస్టర్, శ్రీమతి, మొదలైనవి.",
+Preview Email,ఇమెయిల్ ప్రివ్యూ,
+Please select a Supplier,దయచేసి సరఫరాదారుని ఎంచుకోండి,
+Supplier Lead Time (days),సరఫరాదారు లీడ్ సమయం (రోజులు),
+"Home, Work, etc.","ఇల్లు, పని మొదలైనవి.",
+Exit Interview Held On,ఇంటర్వ్యూ నుండి నిష్క్రమించు,
+Condition and formula,పరిస్థితి మరియు సూత్రం,
+Sets 'Target Warehouse' in each row of the Items table.,ఐటమ్స్ టేబుల్ యొక్క ప్రతి వరుసలో &#39;టార్గెట్ వేర్‌హౌస్&#39; సెట్ చేస్తుంది.,
+Sets 'Source Warehouse' in each row of the Items table.,ఐటమ్స్ టేబుల్ యొక్క ప్రతి వరుసలో &#39;సోర్స్ వేర్‌హౌస్&#39; సెట్ చేస్తుంది.,
+POS Register,POS రిజిస్టర్,
+"Can not filter based on POS Profile, if grouped by POS Profile","POS ప్రొఫైల్ ద్వారా సమూహం చేయబడితే, POS ప్రొఫైల్ ఆధారంగా ఫిల్టర్ చేయలేరు",
+"Can not filter based on Customer, if grouped by Customer",కస్టమర్ సమూహం చేస్తే కస్టమర్ ఆధారంగా ఫిల్టర్ చేయలేరు,
+"Can not filter based on Cashier, if grouped by Cashier","క్యాషియర్ చేత సమూహం చేయబడితే, క్యాషియర్ ఆధారంగా ఫిల్టర్ చేయలేరు",
+Payment Method,చెల్లింపు పద్ధతి,
+"Can not filter based on Payment Method, if grouped by Payment Method","చెల్లింపు విధానం ద్వారా సమూహం చేయబడితే, చెల్లింపు విధానం ఆధారంగా ఫిల్టర్ చేయలేరు",
+Supplier Quotation Comparison,సరఫరాదారు కొటేషన్ పోలిక,
+Price per Unit (Stock UOM),యూనిట్ ధర (స్టాక్ UOM),
+Group by Supplier,సరఫరాదారుచే సమూహం,
+Group by Item,అంశం ద్వారా సమూహం,
+Remember to set {field_label}. It is required by {regulation}.,{Field_label set సెట్ చేయడం గుర్తుంచుకోండి. ఇది {నియంత్రణ by ద్వారా అవసరం.,
+Enrollment Date cannot be before the Start Date of the Academic Year {0},నమోదు తేదీ విద్యా సంవత్సర ప్రారంభ తేదీకి ముందు ఉండకూడదు {0},
+Enrollment Date cannot be after the End Date of the Academic Term {0},నమోదు తేదీ అకాడెమిక్ టర్మ్ {0 ముగింపు తేదీ తర్వాత ఉండకూడదు.,
+Enrollment Date cannot be before the Start Date of the Academic Term {0},నమోదు తేదీ విద్యా పదం {0 start ప్రారంభ తేదీకి ముందు ఉండకూడదు.,
+Posting future transactions are not allowed due to Immutable Ledger,మార్పులేని లెడ్జర్ కారణంగా భవిష్యత్ లావాదేవీలను పోస్ట్ చేయడం అనుమతించబడదు,
+Future Posting Not Allowed,భవిష్యత్ పోస్టింగ్ అనుమతించబడదు,
+"To enable Capital Work in Progress Accounting, ","ప్రోగ్రెస్ అకౌంటింగ్‌లో మూలధన పనిని ప్రారంభించడానికి,",
+you must select Capital Work in Progress Account in accounts table,మీరు ఖాతాల పట్టికలో ప్రోగ్రెస్ ఖాతాలో మూలధన పనిని ఎంచుకోవాలి,
+You can also set default CWIP account in Company {},మీరు కంపెనీ} in లో డిఫాల్ట్ CWIP ఖాతాను కూడా సెట్ చేయవచ్చు,
+The Request for Quotation can be accessed by clicking on the following button,కింది బటన్‌పై క్లిక్ చేయడం ద్వారా కొటేషన్ కోసం అభ్యర్థనను యాక్సెస్ చేయవచ్చు,
+Regards,గౌరవంతో,
+Please click on the following button to set your new password,దయచేసి మీ క్రొత్త పాస్‌వర్డ్‌ను సెట్ చేయడానికి క్రింది బటన్‌పై క్లిక్ చేయండి,
+Update Password,పాస్వర్డ్ను నవీకరించండి,
+Row #{}: Selling rate for item {} is lower than its {}. Selling {} should be atleast {},అడ్డు వరుస # {}: అంశం item for కోసం అమ్మకం రేటు దాని than than కన్నా తక్కువ. {S అమ్మకం కనీసం ఉండాలి}},
+You can alternatively disable selling price validation in {} to bypass this validation.,ఈ ధ్రువీకరణను దాటవేయడానికి మీరు ప్రత్యామ్నాయంగా price in లో ధర ధ్రువీకరణను నిలిపివేయవచ్చు.,
+Invalid Selling Price,చెల్లని అమ్మకం ధర,
+Address needs to be linked to a Company. Please add a row for Company in the Links table.,చిరునామాను కంపెనీకి లింక్ చేయాలి. దయచేసి లింక్స్ పట్టికలో కంపెనీ కోసం ఒక వరుసను జోడించండి.,
+Company Not Linked,కంపెనీ లింక్ చేయబడలేదు,
+Import Chart of Accounts from CSV / Excel files,CSV / Excel ఫైళ్ళ నుండి ఖాతాల చార్ట్ను దిగుమతి చేయండి,
+Completed Qty cannot be greater than 'Qty to Manufacture',పూర్తయిన Qty &#39;తయారీకి Qty&#39; కంటే ఎక్కువగా ఉండకూడదు,
+"Row {0}: For Supplier {1}, Email Address is Required to send an email","అడ్డు వరుస {0}: సరఫరాదారు {1 For కోసం, ఇమెయిల్ పంపడానికి ఇమెయిల్ చిరునామా అవసరం",
diff --git a/erpnext/translations/th.csv b/erpnext/translations/th.csv
index 26aadc3..fc9e149 100644
--- a/erpnext/translations/th.csv
+++ b/erpnext/translations/th.csv
@@ -521,7 +521,6 @@
 Chargeble,Chargeble,
 Charges are updated in Purchase Receipt against each item,ค่าใช้จ่ายที่มีการปรับปรุงในใบเสร็จรับเงินกับแต่ละรายการ,
 "Charges will be distributed proportionately based on item qty or amount, as per your selection",ค่าใช้จ่ายจะถูกกระจายไปตามสัดส่วนในปริมาณรายการหรือจำนวนเงินตามที่คุณเลือก,
-Chart Of Accounts,ผังบัญชี,
 Chart of Cost Centers,แผนภูมิของศูนย์ต้นทุน,
 Check all,ตรวจสอบทั้งหมด,
 Checkout,เช็คเอาท์,
@@ -581,7 +580,6 @@
 Compensatory Off,ชดเชย ปิด,
 Compensatory leave request days not in valid holidays,วันที่ขอใบชดเชยไม่อยู่ในวันหยุดที่ถูกต้อง,
 Complaint,การร้องเรียน,
-Completed Qty can not be greater than 'Qty to Manufacture',เสร็จสมบูรณ์จำนวนไม่สามารถจะสูงกว่า 'จำนวนการผลิต',
 Completion Date,วันที่เสร็จสมบูรณ์,
 Computer,คอมพิวเตอร์,
 Condition,สภาพ,
@@ -2033,7 +2031,6 @@
 Please select Charge Type first,กรุณาเลือก ประเภท ค่าใช้จ่าย ครั้งแรก,
 Please select Company,กรุณาเลือก บริษัท,
 Please select Company and Designation,โปรดเลือก บริษัท และชื่อ,
-Please select Company and Party Type first,กรุณาเลือก บริษัท และประเภทพรรคแรก,
 Please select Company and Posting Date to getting entries,โปรดเลือก บริษัท และผ่านรายการวันที่เพื่อรับรายการ,
 Please select Company first,กรุณาเลือก บริษัท แรก,
 Please select Completion Date for Completed Asset Maintenance Log,โปรดเลือกวันที่เสร็จสิ้นสำหรับบันทึกการบำรุงรักษาสินทรัพย์ที่สมบูรณ์,
@@ -2980,7 +2977,6 @@
 The name of your company for which you are setting up this system.,ชื่อของ บริษัท ของคุณ ที่คุณ มีการตั้งค่า ระบบนี้,
 The number of shares and the share numbers are inconsistent,จำนวนหุ้นและจำนวนหุ้นมีความไม่สอดคล้องกัน,
 The payment gateway account in plan {0} is different from the payment gateway account in this payment request,บัญชีเกตเวย์การชำระเงินในแผน {0} แตกต่างจากบัญชีเกตเวย์การชำระเงินในคำขอการชำระเงินนี้,
-The request for quotation can be accessed by clicking on the following link,การขอใบเสนอราคาสามารถเข้าถึงได้โดยการคลิกที่ลิงค์ต่อไปนี้,
 The selected BOMs are not for the same item,BOMs ที่เลือกไม่ได้สำหรับรายการเดียวกัน,
 The selected item cannot have Batch,รายการที่เลือกไม่สามารถมีแบทช์,
 The seller and the buyer cannot be the same,ผู้ขายและผู้ซื้อต้องไม่เหมือนกัน,
@@ -3130,7 +3126,6 @@
 Total flexible benefit component amount {0} should not be less than max benefits {1},จำนวนองค์ประกอบผลประโยชน์รวมที่ยืดหยุ่น {0} ไม่ควรน้อยกว่าผลประโยชน์สูงสุด {1},
 Total hours: {0},ชั่วโมงรวม: {0},
 Total leaves allocated is mandatory for Leave Type {0},ใบที่จัดสรรไว้ทั้งหมดเป็นข้อบังคับสำหรับ Leave Type {0},
-Total weightage assigned should be 100%. It is {0},weightage รวม ที่ได้รับมอบหมาย ควรจะ 100% มันเป็น {0},
 Total working hours should not be greater than max working hours {0},ชั่วโมงการทำงานรวมไม่ควรมากกว่าชั่วโมงการทำงานสูงสุด {0},
 Total {0} ({1}),รวม {0} ({1}),
 "Total {0} for all items is zero, may be you should change 'Distribute Charges Based On'",รวม {0} สำหรับรายการทั้งหมดเป็นศูนย์อาจจะเป็นคุณควรเปลี่ยน &#39;กระจายค่าใช้จ่ายขึ้นอยู่กับ&#39;,
@@ -3544,7 +3539,6 @@
 Company field is required,ต้องระบุข้อมูล บริษัท,
 Creating Dimensions...,กำลังสร้างมิติ ...,
 Duplicate entry against the item code {0} and manufacturer {1},รายการซ้ำกับรหัสรายการ {0} และผู้ผลิต {1},
-Import Chart Of Accounts from CSV / Excel files,นำเข้าผังบัญชีจากไฟล์ CSV / Excel,
 Invalid GSTIN! The input you've entered doesn't match the GSTIN format for UIN Holders or Non-Resident OIDAR Service Providers,GSTIN ไม่ถูกต้อง! ข้อมูลที่คุณป้อนไม่ตรงกับรูปแบบ GSTIN สำหรับผู้ถือ UIN หรือผู้ให้บริการ OIDAR ที่ไม่ใช่ผู้อยู่อาศัย,
 Invoice Grand Total,ยอดรวมใบแจ้งหนี้,
 Last carbon check date cannot be a future date,วันที่ตรวจสอบคาร์บอนครั้งสุดท้ายไม่สามารถเป็นวันที่ในอนาคตได้,
@@ -3921,7 +3915,6 @@
 Plaid public token error,ทำเครื่องหมายข้อผิดพลาดโทเค็นพับลิก,
 Plaid transactions sync error,ข้อผิดพลาดในการซิงค์ธุรกรรมของ Plaid,
 Please check the error log for details about the import errors,โปรดตรวจสอบบันทึกข้อผิดพลาดเพื่อดูรายละเอียดเกี่ยวกับข้อผิดพลาดในการนำเข้า,
-Please click on the following link to set your new password,กรุณาคลิกที่ลิงค์ต่อไปนี้เพื่อตั้งค่ารหัสผ่านใหม่ของคุณ,
 Please create <b>DATEV Settings</b> for Company <b>{}</b>.,โปรดสร้าง <b>การตั้งค่า DATEV</b> สำหรับ บริษัท <b>{}</b>,
 Please create adjustment Journal Entry for amount {0} ,โปรดสร้างการปรับรายการบันทึกประจำวันสำหรับจำนวน {0},
 Please do not create more than 500 items at a time,โปรดอย่าสร้างมากกว่า 500 รายการในเวลาเดียวกัน,
@@ -3997,6 +3990,7 @@
 Release date must be in the future,วันที่วางจำหน่ายจะต้องเป็นวันที่ในอนาคต,
 Relieving Date must be greater than or equal to Date of Joining,วันที่บรรเทาจะต้องมากกว่าหรือเท่ากับวันที่เข้าร่วม,
 Rename,ตั้งชื่อใหม่,
+Rename Not Allowed,ไม่อนุญาตให้เปลี่ยนชื่อ,
 Repayment Method is mandatory for term loans,วิธีการชำระคืนมีผลบังคับใช้สำหรับสินเชื่อระยะยาว,
 Repayment Start Date is mandatory for term loans,วันที่เริ่มต้นชำระคืนมีผลบังคับใช้กับสินเชื่อระยะยาว,
 Report Item,รายการรายงาน,
@@ -4043,7 +4037,6 @@
 Select All,เลือกทั้งหมด,
 Select Difference Account,เลือกบัญชีที่แตกต่าง,
 Select a Default Priority.,เลือกลำดับความสำคัญเริ่มต้น,
-Select a Supplier from the Default Supplier List of the items below.,เลือกผู้จัดหาจากรายการผู้จัดหาเริ่มต้นของรายการด้านล่าง,
 Select a company,เลือก บริษัท,
 Select finance book for the item {0} at row {1},เลือกสมุดการเงินสำหรับรายการ {0} ที่แถว {1},
 Select only one Priority as Default.,เลือกลำดับความสำคัญเดียวเป็นค่าเริ่มต้น,
@@ -4247,7 +4240,6 @@
 Actual ,ตามความเป็นจริง,
 Add to cart,ใส่ในรถเข็น,
 Budget,งบประมาณ,
-Chart Of Accounts Importer,ผู้นำเข้าผังบัญชี,
 Chart of Accounts,ผังบัญชี,
 Customer database.,ฐานข้อมูลลูกค้า,
 Days Since Last order,วันนับตั้งแต่คำสั่งซื้อล่าสุด,
@@ -4546,7 +4538,6 @@
 Check Supplier Invoice Number Uniqueness,ผู้ตรวจสอบใบแจ้งหนี้จำนวนเอกลักษณ์,
 Make Payment via Journal Entry,ชำระเงินผ่านวารสารรายการ,
 Unlink Payment on Cancellation of Invoice,ยกเลิกการเชื่อมโยงการชำระเงินในการยกเลิกใบแจ้งหนี้,
-Unlink Advance Payment on Cancelation of Order,ยกเลิกการเชื่อมโยงการชำระเงินล่วงหน้าเมื่อมีการยกเลิกคำสั่งซื้อ,
 Book Asset Depreciation Entry Automatically,บัญชีค่าเสื่อมราคาสินทรัพย์โดยอัตโนมัติ,
 Automatically Add Taxes and Charges from Item Tax Template,เพิ่มภาษีและค่าธรรมเนียมโดยอัตโนมัติจากเทมเพลตภาษีของรายการ,
 Automatically Fetch Payment Terms,ดึงข้อมูลเงื่อนไขการชำระเงินอัตโนมัติ,
@@ -4940,7 +4931,6 @@
 POS Customer Group,กลุ่มลูกค้า จุดขายหน้าร้าน,
 POS Field,ฟิลด์ POS,
 POS Item Group,กลุ่มสินค้า จุดขาย,
-[Select],[เลือก ],
 Company Address,ที่อยู่ บริษัท,
 Update Stock,อัพเดทสต็อก,
 Ignore Pricing Rule,ละเว้นกฎการกำหนดราคา,
@@ -6481,7 +6471,6 @@
 Appraisal Template,แม่แบบการประเมิน,
 For Employee Name,สำหรับชื่อของพนักงาน,
 Goals,เป้าหมาย,
-Calculate Total Score,คำนวณคะแนนรวม,
 Total Score (Out of 5),คะแนนรวม (out of 5),
 "Any other remarks, noteworthy effort that should go in the records.",ใด ๆ ข้อสังเกตอื่น ๆ ความพยายามที่น่าสังเกตว่าควรจะไปในบันทึก,
 Appraisal Goal,เป้าหมายการประเมิน,
@@ -6599,11 +6588,6 @@
 Reason for Leaving,เหตุผลที่ลาออก,
 Leave Encashed?,ฝาก Encashed?,
 Encashment Date,วันที่การได้เป็นเงินสด,
-Exit Interview Details,ออกจากรายละเอียดการสัมภาษณ์,
-Held On,จัดขึ้นเมื่อวันที่,
-Reason for Resignation,เหตุผลในการลาออก,
-Better Prospects,อนาคตที่ดีกว่า,
-Health Concerns,ความกังวลเรื่องสุขภาพ,
 New Workplace,สถานที่ทำงานใหม่,
 HR-EAD-.YYYY.-,HR-EAD-.YYYY.-,
 Returned Amount,จำนวนเงินคืน,
@@ -8239,9 +8223,6 @@
 Manufacturers used in Items,ผู้ผลิตนำมาใช้ในรายการ,
 Limited to 12 characters,จำกัด 12 ตัวอักษร,
 MAT-MR-.YYYY.-,MAT-MR-.YYYY.-,
-Set Warehouse,ตั้งคลังสินค้า,
-Sets 'For Warehouse' in each row of the Items table.,ตั้งค่า &#39;สำหรับคลังสินค้า&#39; ในแต่ละแถวของตารางรายการ,
-Requested For,สำหรับ การร้องขอ,
 Partially Ordered,สั่งซื้อบางส่วน,
 Transferred,โอน,
 % Ordered,% สั่งแล้ว,
@@ -8690,8 +8671,6 @@
 Select warehouse for material requests,เลือกคลังสินค้าสำหรับคำขอวัสดุ,
 Transfer Materials For Warehouse {0},โอนวัสดุสำหรับคลังสินค้า {0},
 Production Plan Material Request Warehouse,คลังสินค้าขอวัสดุแผนการผลิต,
-Set From Warehouse,ตั้งค่าจากคลังสินค้า,
-Source Warehouse (Material Transfer),คลังสินค้าต้นทาง (การขนย้ายวัสดุ),
 Sets 'Source Warehouse' in each row of the items table.,ตั้งค่า &#39;Source Warehouse&#39; ในแต่ละแถวของตารางรายการ,
 Sets 'Target Warehouse' in each row of the items table.,ตั้งค่า &#39;คลังสินค้าเป้าหมาย&#39; ในแต่ละแถวของตารางรายการ,
 Show Cancelled Entries,แสดงรายการที่ถูกยกเลิก,
@@ -9157,7 +9136,6 @@
 Is Income Tax Component,เป็นส่วนประกอบของภาษีเงินได้,
 Component properties and references ,คุณสมบัติของส่วนประกอบและการอ้างอิง,
 Additional Salary ,เงินเดือนเพิ่มเติม,
-Condtion and formula,สภาพและสูตร,
 Unmarked days,วันที่ไม่มีเครื่องหมาย,
 Absent Days,วันที่ขาด,
 Conditions and Formula variable and example,เงื่อนไขและสูตรตัวแปรและตัวอย่าง,
@@ -9444,7 +9422,6 @@
 Please check your Plaid client ID and secret values,โปรดตรวจสอบรหัสไคลเอ็นต์ Plaid และค่าลับของคุณ,
 Bank transaction creation error,ข้อผิดพลาดในการสร้างธุรกรรมธนาคาร,
 Unit of Measurement,หน่วยวัด,
-Row #{}: Selling rate for item {} is lower than its {}. Selling rate should be atleast {},แถว # {}: อัตราการขายสำหรับสินค้า {} ต่ำกว่าของมัน {} อัตราการขายควรอยู่ที่ขั้นต่ำ {},
 Fiscal Year {0} Does Not Exist,ปีบัญชี {0} ไม่มีอยู่,
 Row # {0}: Returned Item {1} does not exist in {2} {3},แถว # {0}: รายการที่ส่งคืน {1} ไม่มีอยู่ใน {2} {3},
 Valuation type charges can not be marked as Inclusive,ไม่สามารถทำเครื่องหมายประเภทการประเมินค่าเป็นแบบรวมได้,
@@ -9598,8 +9575,60 @@
 Response Time for {0} priority in row {1} can't be greater than Resolution Time.,เวลาตอบสนองสำหรับลำดับความสำคัญ {0} ในแถว {1} ต้องไม่มากกว่าเวลาความละเอียด,
 {0} is not enabled in {1},{0} ไม่ได้เปิดใช้งานใน {1},
 Group by Material Request,จัดกลุ่มตามคำขอวัสดุ,
-"Row {0}: For Supplier {0}, Email Address is Required to Send Email",แถว {0}: สำหรับซัพพลายเออร์ {0} ต้องใช้ที่อยู่อีเมลเพื่อส่งอีเมล,
 Email Sent to Supplier {0},ส่งอีเมลไปยังซัพพลายเออร์ {0},
 "The Access to Request for Quotation From Portal is Disabled. To Allow Access, Enable it in Portal Settings.",การเข้าถึงเพื่อขอใบเสนอราคาจากพอร์ทัลถูกปิดใช้งาน ในการอนุญาตการเข้าถึงให้เปิดใช้งานในการตั้งค่าพอร์ทัล,
 Supplier Quotation {0} Created,สร้างใบเสนอราคาซัพพลายเออร์ {0},
 Valid till Date cannot be before Transaction Date,ไม่สามารถใช้ได้จนถึงวันที่ก่อนวันที่ทำธุรกรรม,
+Unlink Advance Payment on Cancellation of Order,ยกเลิกการเชื่อมโยงการชำระเงินล่วงหน้าเมื่อยกเลิกคำสั่งซื้อ,
+"Simple Python Expression, Example: territory != 'All Territories'",นิพจน์ Python อย่างง่ายตัวอย่าง: อาณาเขต! = &#39;ดินแดนทั้งหมด&#39;,
+Sales Contributions and Incentives,ผลงานการขายและสิ่งจูงใจ,
+Sourced by Supplier,มาจากซัพพลายเออร์,
+Total weightage assigned should be 100%.<br>It is {0},น้ำหนักรวมที่กำหนดควรเป็น 100%<br> เป็น {0},
+Account {0} exists in parent company {1}.,บัญชี {0} มีอยู่ใน บริษัท แม่ {1},
+"To overrule this, enable '{0}' in company {1}",ในการแก้ไขปัญหานี้ให้เปิดใช้งาน &quot;{0}&quot; ใน บริษัท {1},
+Invalid condition expression,นิพจน์เงื่อนไขไม่ถูกต้อง,
+Please Select a Company First,กรุณาเลือก บริษัท ก่อน,
+Please Select Both Company and Party Type First,โปรดเลือกทั้ง บริษัท และประเภทปาร์ตี้ก่อน,
+Provide the invoice portion in percent,ระบุส่วนของใบแจ้งหนี้เป็นเปอร์เซ็นต์,
+Give number of days according to prior selection,ระบุจำนวนวันตามการเลือกก่อน,
+Email Details,รายละเอียดอีเมล,
+"Select a greeting for the receiver. E.g. Mr., Ms., etc.",เลือกคำทักทายสำหรับผู้รับ เช่นนายนางสาว ฯลฯ,
+Preview Email,ดูตัวอย่างอีเมล,
+Please select a Supplier,โปรดเลือกซัพพลายเออร์,
+Supplier Lead Time (days),ระยะเวลาดำเนินการของซัพพลายเออร์ (วัน),
+"Home, Work, etc.",บ้านที่ทำงาน ฯลฯ,
+Exit Interview Held On,ออกจากการสัมภาษณ์จัดขึ้นเมื่อวันที่,
+Condition and formula,เงื่อนไขและสูตร,
+Sets 'Target Warehouse' in each row of the Items table.,ตั้งค่า &#39;คลังสินค้าเป้าหมาย&#39; ในแต่ละแถวของตารางรายการ,
+Sets 'Source Warehouse' in each row of the Items table.,ตั้งค่า &#39;คลังต้นทาง&#39; ในแต่ละแถวของตารางรายการ,
+POS Register,ลงทะเบียน POS,
+"Can not filter based on POS Profile, if grouped by POS Profile",ไม่สามารถกรองตามโพรไฟล์ POS หากจัดกลุ่มตามโพรไฟล์ POS,
+"Can not filter based on Customer, if grouped by Customer",ไม่สามารถกรองตามลูกค้าหากจัดกลุ่มตามลูกค้า,
+"Can not filter based on Cashier, if grouped by Cashier",ไม่สามารถกรองตามแคชเชียร์หากจัดกลุ่มตามแคชเชียร์,
+Payment Method,วิธีการชำระเงิน,
+"Can not filter based on Payment Method, if grouped by Payment Method",ไม่สามารถกรองตามวิธีการชำระเงินหากจัดกลุ่มตามวิธีการชำระเงิน,
+Supplier Quotation Comparison,การเปรียบเทียบใบเสนอราคาของซัพพลายเออร์,
+Price per Unit (Stock UOM),ราคาต่อหน่วย (Stock UOM),
+Group by Supplier,จัดกลุ่มตามซัพพลายเออร์,
+Group by Item,จัดกลุ่มตามรายการ,
+Remember to set {field_label}. It is required by {regulation}.,อย่าลืมตั้งค่า {field_label} จำเป็นต้องมีตาม {ระเบียบ},
+Enrollment Date cannot be before the Start Date of the Academic Year {0},วันที่ลงทะเบียนต้องไม่อยู่ก่อนวันที่เริ่มต้นปีการศึกษา {0},
+Enrollment Date cannot be after the End Date of the Academic Term {0},วันที่ลงทะเบียนต้องไม่อยู่หลังวันสิ้นสุดของภาคการศึกษา {0},
+Enrollment Date cannot be before the Start Date of the Academic Term {0},วันที่ลงทะเบียนต้องไม่อยู่ก่อนวันที่เริ่มภาคเรียน {0},
+Posting future transactions are not allowed due to Immutable Ledger,ไม่อนุญาตให้โพสต์ธุรกรรมในอนาคตเนื่องจากบัญชีแยกประเภทไม่เปลี่ยนรูป,
+Future Posting Not Allowed,ไม่อนุญาตให้โพสต์ในอนาคต,
+"To enable Capital Work in Progress Accounting, ",เพื่อเปิดใช้งานการบัญชีงานทุนระหว่างดำเนินการ,
+you must select Capital Work in Progress Account in accounts table,คุณต้องเลือกบัญชีทุนระหว่างดำเนินงานในตารางบัญชี,
+You can also set default CWIP account in Company {},คุณยังสามารถตั้งค่าบัญชี CWIP เริ่มต้นใน บริษัท {},
+The Request for Quotation can be accessed by clicking on the following button,สามารถเข้าถึงคำขอใบเสนอราคาได้โดยคลิกที่ปุ่มต่อไปนี้,
+Regards,ความนับถือ,
+Please click on the following button to set your new password,กรุณาคลิกที่ปุ่มต่อไปนี้เพื่อตั้งรหัสผ่านใหม่ของคุณ,
+Update Password,อัปเดตรหัสผ่าน,
+Row #{}: Selling rate for item {} is lower than its {}. Selling {} should be atleast {},แถว # {}: อัตราการขายสำหรับสินค้า {} ต่ำกว่าของมัน {} การขาย {} ควรเป็นอย่างน้อยที่สุด {},
+You can alternatively disable selling price validation in {} to bypass this validation.,คุณสามารถปิดใช้งานการตรวจสอบราคาขายได้ใน {} เพื่อข้ามการตรวจสอบความถูกต้องนี้,
+Invalid Selling Price,ราคาขายไม่ถูกต้อง,
+Address needs to be linked to a Company. Please add a row for Company in the Links table.,ที่อยู่จะต้องเชื่อมโยงกับ บริษัท โปรดเพิ่มแถวสำหรับ บริษัท ในตารางลิงค์,
+Company Not Linked,บริษัท ไม่ได้เชื่อมโยง,
+Import Chart of Accounts from CSV / Excel files,นำเข้าผังบัญชีจากไฟล์ CSV / Excel,
+Completed Qty cannot be greater than 'Qty to Manufacture',จำนวนที่เสร็จสมบูรณ์ต้องไม่เกิน &#39;จำนวนที่จะผลิต&#39;,
+"Row {0}: For Supplier {1}, Email Address is Required to send an email",แถว {0}: สำหรับซัพพลายเออร์ {1} ต้องใช้ที่อยู่อีเมลเพื่อส่งอีเมล,
diff --git a/erpnext/translations/tr.csv b/erpnext/translations/tr.csv
index 0329482..2a8d990 100644
--- a/erpnext/translations/tr.csv
+++ b/erpnext/translations/tr.csv
@@ -521,7 +521,6 @@
 Chargeble,chargeble,
 Charges are updated in Purchase Receipt against each item,Ücretler her öğenin karşı Satınalma Fiş güncellenir,
 "Charges will be distributed proportionately based on item qty or amount, as per your selection","Masraflar orantılı seçiminize göre, madde qty veya miktarına göre dağıtılmış olacak",
-Chart Of Accounts,Hesap tablosu,
 Chart of Cost Centers,Maliyet Merkezlerinin Grafikleri,
 Check all,Tümünü kontrol,
 Checkout,Çıkış yapmak,
@@ -581,7 +580,6 @@
 Compensatory Off,Telafi İzni,
 Compensatory leave request days not in valid holidays,Telafi izin isteme günleri geçerli tatil günlerinde geçerli değildir,
 Complaint,şikâyet,
-Completed Qty can not be greater than 'Qty to Manufacture',Daha 'Miktar imalatı için' Tamamlandı Adet büyük olamaz,
 Completion Date,Bitiş Tarihi,
 Computer,Bilgisayar,
 Condition,Koşul,
@@ -2033,7 +2031,6 @@
 Please select Charge Type first,İlk şarj türünü seçiniz,
 Please select Company,Firma seçiniz,
 Please select Company and Designation,Lütfen Şirket ve Atama&#39;yı seçiniz,
-Please select Company and Party Type first,İlk Şirket ve Parti Tipi seçiniz,
 Please select Company and Posting Date to getting entries,Giriş almak için lütfen Şirket ve Gönderme Tarihi&#39;ni seçin.,
 Please select Company first,İlk Şirket seçiniz,
 Please select Completion Date for Completed Asset Maintenance Log,Tamamlanan Varlık Bakım Günlüğü için Tamamlanma Tarihi&#39;ni seçin,
@@ -2980,7 +2977,6 @@
 The name of your company for which you are setting up this system.,Bu sistemi kurduğunu şirketinizin adı,
 The number of shares and the share numbers are inconsistent,Hisse sayısı ve hisse sayıları tutarsız,
 The payment gateway account in plan {0} is different from the payment gateway account in this payment request,"{0} planındaki ödeme ağ geçidi hesabı, bu ödeme isteğindeki ödeme ağ geçidi hesabından farklıdır",
-The request for quotation can be accessed by clicking on the following link,tırnak talebi aşağıdaki linke tıklayarak ulaşabilirsiniz,
 The selected BOMs are not for the same item,Seçilen malzeme listeleri aynı madde için değildir,
 The selected item cannot have Batch,Seçilen öğe Toplu olamaz,
 The seller and the buyer cannot be the same,Satıcı ve alıcı aynı olamaz,
@@ -3130,7 +3126,6 @@
 Total flexible benefit component amount {0} should not be less than max benefits {1},"Toplam esnek fayda bileşeni {0} tutarı, maksimum yarardan {1} daha az olmamalıdır",
 Total hours: {0},Toplam saat: {0},
 Total leaves allocated is mandatory for Leave Type {0},{0} İzin Türü için ayrılan toplam izinler zorunludur,
-Total weightage assigned should be 100%. It is {0},Atanan toplam ağırlık % 100 olmalıdır. Bu {0} dır,
 Total working hours should not be greater than max working hours {0},Toplam çalışma süresi maksimum çalışma saatleri fazla olmamalıdır {0},
 Total {0} ({1}),Toplam {0} ({1}),
 "Total {0} for all items is zero, may be you should change 'Distribute Charges Based On'",Toplam {0} tüm öğeler için size &#39;Dayalı Suçlamaları dağıtın&#39; değişmelidir olabilir sıfırdır,
@@ -3544,7 +3539,6 @@
 Company field is required,Şirket alanı zorunludur,
 Creating Dimensions...,Boyutların Oluşturulması ...,
 Duplicate entry against the item code {0} and manufacturer {1},{0} ürün koduna ve {1} üreticisine karşı yinelenen giriş,
-Import Chart Of Accounts from CSV / Excel files,CSV / Excel dosyalarından Hesap Planını İçe Aktar,
 Invalid GSTIN! The input you've entered doesn't match the GSTIN format for UIN Holders or Non-Resident OIDAR Service Providers,"Geçersiz GSTIN! Girdiğiniz giriş, UIN Sahipleri veya Yerleşik Olmayan OIDAR Servis Sağlayıcıları için GSTIN biçimiyle eşleşmiyor",
 Invoice Grand Total,Fatura Genel Toplamı,
 Last carbon check date cannot be a future date,Son karbon kontrol tarihi gelecekteki bir tarih olamaz,
@@ -3921,7 +3915,6 @@
 Plaid public token error,Ekose genel belirteç hatası,
 Plaid transactions sync error,Ekose işlemler senkronizasyon hatası,
 Please check the error log for details about the import errors,Lütfen içe aktarma hatalarıyla ilgili ayrıntılar için hata günlüğünü kontrol edin,
-Please click on the following link to set your new password,Yeni şifrenizi ayarlamak için aşağıdaki linke tıklayınız,
 Please create <b>DATEV Settings</b> for Company <b>{}</b>.,Lütfen <b>{}</b> Şirketi için <b>DATEV Ayarları</b> oluşturun.,
 Please create adjustment Journal Entry for amount {0} ,Lütfen {0} tutarı için Dergi Girişi ayarlamasını oluşturun,
 Please do not create more than 500 items at a time,Lütfen bir kerede 500&#39;den fazla öğe oluşturmayın,
@@ -3997,6 +3990,7 @@
 Release date must be in the future,Çıkış tarihi gelecekte olmalı,
 Relieving Date must be greater than or equal to Date of Joining,"Rahatlama Tarihi, Katılım Tarihinden büyük veya ona eşit olmalıdır",
 Rename,Yeniden adlandır,
+Rename Not Allowed,Yeniden Adlandır İzin Verilmez,
 Repayment Method is mandatory for term loans,Vadeli krediler için geri ödeme yöntemi zorunludur,
 Repayment Start Date is mandatory for term loans,Vadeli krediler için geri ödeme başlangıç tarihi zorunludur,
 Report Item,Öğe Bildir,
@@ -4043,7 +4037,6 @@
 Select All,Tümünü Seç,
 Select Difference Account,Fark Hesabı Seç,
 Select a Default Priority.,Varsayılan bir öncelik seçin.,
-Select a Supplier from the Default Supplier List of the items below.,Aşağıdaki öğelerin Varsayılan Tedarikçi Listesinden bir Tedarikçi seçin.,
 Select a company,Bir şirket seçin,
 Select finance book for the item {0} at row {1},{1} satırındaki {0} maddesi için finansman kitabını seçin,
 Select only one Priority as Default.,Varsayılan olarak sadece bir Öncelik seçin.,
@@ -4247,7 +4240,6 @@
 Actual ,Gerçek,
 Add to cart,Sepete ekle,
 Budget,Bütçe,
-Chart Of Accounts Importer,İhracatçı Hesap Planı,
 Chart of Accounts,Hesap tablosu,
 Customer database.,Müşteri veritabanı.,
 Days Since Last order,Son siparişten bu yana geçen günler,
@@ -4546,7 +4538,6 @@
 Check Supplier Invoice Number Uniqueness,Benzersiz Tedarikçi Fatura Numarasını Kontrol Edin,
 Make Payment via Journal Entry,Dergi Giriş aracılığıyla Ödeme Yap,
 Unlink Payment on Cancellation of Invoice,Fatura İptaline İlişkin Ödeme bağlantısını kaldır,
-Unlink Advance Payment on Cancelation of Order,Siparişin İptal Edilmesinde Avans Ödemesi Bağlantısını Kaldırma,
 Book Asset Depreciation Entry Automatically,Varlık Amortisman Kayıtını Otomatik Olarak Kaydedin,
 Automatically Add Taxes and Charges from Item Tax Template,Öğe Vergisi Şablonundan Otomatik Olarak Vergi ve Masraf Ekleme,
 Automatically Fetch Payment Terms,Ödeme Koşullarını Otomatik Olarak Al,
@@ -4940,7 +4931,6 @@
 POS Customer Group,POS Müşteri Grubu,
 POS Field,POS Alanı,
 POS Item Group,POS Ürün Grubu,
-[Select],[Seç],
 Company Address,şirket adresi,
 Update Stock,Stok güncelle,
 Ignore Pricing Rule,Fiyatlandırma Kuralı Yoksay,
@@ -6481,7 +6471,6 @@
 Appraisal Template,Değerlendirme Şablonu,
 For Employee Name,Çalışan Adına,
 Goals,Hedefler,
-Calculate Total Score,Toplam Puan Hesapla,
 Total Score (Out of 5),Toplam Puan (5 üzerinden),
 "Any other remarks, noteworthy effort that should go in the records.","Başka bir konuşmasında, kayıtlarda gitmeli kayda değer çaba.",
 Appraisal Goal,Değerlendirme Hedefi,
@@ -6599,11 +6588,6 @@
 Reason for Leaving,Ayrılma Nedeni,
 Leave Encashed?,İzin Tahsil Edilmiş mi?,
 Encashment Date,Nakit Çekim Tarihi,
-Exit Interview Details,Çıkış Görüşmesi Detayları,
-Held On,Yapılan,
-Reason for Resignation,İstifa Nedeni,
-Better Prospects,Iyi Beklentiler,
-Health Concerns,Sağlık Sorunları,
 New Workplace,Yeni İş Yeri,
 HR-EAD-.YYYY.-,HR-EAD-.YYYY.-,
 Returned Amount,İade Edilen Tutar,
@@ -8239,9 +8223,6 @@
 Manufacturers used in Items,Öğeler kullanılan Üreticileri,
 Limited to 12 characters,12 karakter ile sınırlıdır,
 MAT-MR-.YYYY.-,MAT-MR-.YYYY.-,
-Set Warehouse,Depo Ayarla,
-Sets 'For Warehouse' in each row of the Items table.,Kalemler tablosunun her satırında &#39;Depo için&#39; ayarlar.,
-Requested For,Için talep,
 Partially Ordered,Kısmen Sipariş Edildi,
 Transferred,aktarılan,
 % Ordered,% Sipariş edildi,
@@ -8690,8 +8671,6 @@
 Select warehouse for material requests,Malzeme talepleri için depo seçin,
 Transfer Materials For Warehouse {0},Depo İçin Transfer Malzemeleri {0},
 Production Plan Material Request Warehouse,Üretim Planı Malzeme Talebi Depo,
-Set From Warehouse,Depodan Ayarla,
-Source Warehouse (Material Transfer),Kaynak Depo (Malzeme Transferi),
 Sets 'Source Warehouse' in each row of the items table.,Kalemler tablosunun her satırında &#39;Kaynak Depo&#39; ayarlar.,
 Sets 'Target Warehouse' in each row of the items table.,Kalem tablosunun her satırında &#39;Hedef Depo&#39; ayarlar.,
 Show Cancelled Entries,İptal Edilen Girişleri Göster,
@@ -9157,7 +9136,6 @@
 Is Income Tax Component,Gelir Vergisi Bileşeni,
 Component properties and references ,Bileşen özellikleri ve referansları,
 Additional Salary ,Ek Maaş,
-Condtion and formula,Durum ve formül,
 Unmarked days,İşaretlenmemiş günler,
 Absent Days,Devamsızlık Günleri,
 Conditions and Formula variable and example,Koşullar ve Formül değişkeni ve örnek,
@@ -9444,7 +9422,6 @@
 Please check your Plaid client ID and secret values,Lütfen Plaid müşteri kimliğinizi ve gizli değerlerinizi kontrol edin,
 Bank transaction creation error,Banka işlemi oluşturma hatası,
 Unit of Measurement,Ölçü birimi,
-Row #{}: Selling rate for item {} is lower than its {}. Selling rate should be atleast {},"Satır # {}: {} öğesinin satış oranı, {} değerinden düşük. Satış oranı en az olmalıdır {}",
 Fiscal Year {0} Does Not Exist,Mali Yıl {0} Mevcut Değil,
 Row # {0}: Returned Item {1} does not exist in {2} {3},"Satır # {0}: İade Edilen Öğe {1}, {2} {3} içinde mevcut değil",
 Valuation type charges can not be marked as Inclusive,"Değerleme türü ücretler, Kapsayıcı olarak işaretlenemez",
@@ -9598,8 +9575,60 @@
 Response Time for {0} priority in row {1} can't be greater than Resolution Time.,"{1} satırındaki {0} önceliği için Yanıt Süresi, Çözüm Süresinden fazla olamaz.",
 {0} is not enabled in {1},"{0}, {1} içinde etkinleştirilmedi",
 Group by Material Request,Malzeme Talebine Göre Gruplama,
-"Row {0}: For Supplier {0}, Email Address is Required to Send Email","Satır {0}: Tedarikçi {0} için, E-posta Göndermek İçin E-posta Adresi Gereklidir",
 Email Sent to Supplier {0},Tedarikçiye Gönderilen E-posta {0},
 "The Access to Request for Quotation From Portal is Disabled. To Allow Access, Enable it in Portal Settings.",Portaldan Teklif İsteğine Erişim Devre Dışı Bırakıldı. Erişime İzin Vermek için Portal Ayarlarında etkinleştirin.,
 Supplier Quotation {0} Created,Tedarikçi Teklifi {0} Oluşturuldu,
 Valid till Date cannot be before Transaction Date,Tarihe kadar geçerli İşlem Tarihinden önce olamaz,
+Unlink Advance Payment on Cancellation of Order,Sipariş İptali Üzerine Peşin Ödeme Bağlantısını Kaldır,
+"Simple Python Expression, Example: territory != 'All Territories'","Basit Python İfadesi, Örnek: bölge! = &#39;Tüm Bölgeler&#39;",
+Sales Contributions and Incentives,Satış Katkıları ve Teşvikler,
+Sourced by Supplier,Tedarikçi Kaynaklı,
+Total weightage assigned should be 100%.<br>It is {0},Atanan toplam ağırlık% 100 olmalıdır.<br> {0},
+Account {0} exists in parent company {1}.,"{0} hesabı, {1} ana şirkette var.",
+"To overrule this, enable '{0}' in company {1}","Bunu geçersiz kılmak için, {1} şirketinde &quot;{0}&quot; özelliğini etkinleştirin",
+Invalid condition expression,Geçersiz koşul ifadesi,
+Please Select a Company First,Lütfen Önce Bir Şirket Seçin,
+Please Select Both Company and Party Type First,Lütfen Önce Şirket ve Parti Türünü Seçin,
+Provide the invoice portion in percent,Fatura kısmını yüzde olarak sağlayın,
+Give number of days according to prior selection,Önceki seçime göre gün sayısı verin,
+Email Details,E-posta Ayrıntıları,
+"Select a greeting for the receiver. E.g. Mr., Ms., etc.","Alıcı için bir karşılama mesajı seçin. Örneğin Bay, Bayan, vb.",
+Preview Email,E-postayı Önizle,
+Please select a Supplier,Lütfen bir Tedarikçi seçin,
+Supplier Lead Time (days),Tedarikçi Teslimat Süresi (gün),
+"Home, Work, etc.","Ev, İş vb.",
+Exit Interview Held On,Yapılan Görüşmeden Çık,
+Condition and formula,Durum ve formül,
+Sets 'Target Warehouse' in each row of the Items table.,Kalemler tablosunun her satırında &#39;Hedef Depo&#39; ayarlar.,
+Sets 'Source Warehouse' in each row of the Items table.,Kalemler tablosunun her satırında &#39;Kaynak Depo&#39; ayarlar.,
+POS Register,POS Kaydı,
+"Can not filter based on POS Profile, if grouped by POS Profile","POS Profiline göre gruplandırılmışsa, POS Profiline göre filtreleme yapılamaz",
+"Can not filter based on Customer, if grouped by Customer","Müşteriye göre gruplandırılmışsa, Müşteriye göre filtreleme yapılamaz",
+"Can not filter based on Cashier, if grouped by Cashier",Kasiyere göre gruplandırılmışsa Kasiyere göre filtre edilemez,
+Payment Method,Ödeme şekli,
+"Can not filter based on Payment Method, if grouped by Payment Method",Ödeme Yöntemine göre gruplandırılmışsa Ödeme Yöntemine göre filtreleme yapılamaz,
+Supplier Quotation Comparison,Tedarikçi Teklif Karşılaştırması,
+Price per Unit (Stock UOM),Birim Fiyat (Stok UOM),
+Group by Supplier,Tedarikçiye Göre Gruplama,
+Group by Item,Öğeye Göre Gruplama,
+Remember to set {field_label}. It is required by {regulation}.,{Field_label} ayarlamayı unutmayın. {Düzenleme} tarafından gereklidir.,
+Enrollment Date cannot be before the Start Date of the Academic Year {0},"Kayıt Tarihi, Akademik Yılın Başlangıç Tarihinden önce olamaz {0}",
+Enrollment Date cannot be after the End Date of the Academic Term {0},Kayıt Tarihi Akademik Dönemin Bitiş Tarihinden sonra olamaz {0},
+Enrollment Date cannot be before the Start Date of the Academic Term {0},"Kayıt Tarihi, Akademik Dönemin Başlangıç Tarihinden önce olamaz {0}",
+Posting future transactions are not allowed due to Immutable Ledger,Immutable Ledger nedeniyle gelecekteki işlemlerin kaydedilmesine izin verilmiyor,
+Future Posting Not Allowed,Gelecekte Göndermeye İzin Verilmiyor,
+"To enable Capital Work in Progress Accounting, ","Devam Eden Sermaye Çalışması Muhasebesini etkinleştirmek için,",
+you must select Capital Work in Progress Account in accounts table,hesaplar tablosunda Devam Eden Sermaye İşlemi Hesabını seçmelisiniz,
+You can also set default CWIP account in Company {},"Ayrıca, Şirket içinde varsayılan CWIP hesabı da ayarlayabilirsiniz {}",
+The Request for Quotation can be accessed by clicking on the following button,Teklif Talebine aşağıdaki butona tıklanarak ulaşılabilir.,
+Regards,Saygılarımızla,
+Please click on the following button to set your new password,Yeni şifrenizi belirlemek için lütfen aşağıdaki düğmeyi tıklayın,
+Update Password,Şifreyi güncelle,
+Row #{}: Selling rate for item {} is lower than its {}. Selling {} should be atleast {},"Satır # {}: {} öğesinin satış oranı, {} değerinden düşük. {} Satışı en az {} olmalıdır",
+You can alternatively disable selling price validation in {} to bypass this validation.,Bu doğrulamayı atlamak için alternatif olarak {} içinde satış fiyatı doğrulamasını devre dışı bırakabilirsiniz.,
+Invalid Selling Price,Geçersiz Satış Fiyatı,
+Address needs to be linked to a Company. Please add a row for Company in the Links table.,Adresin bir Şirkete bağlanması gerekir. Lütfen Bağlantılar tablosuna Şirket için bir satır ekleyin.,
+Company Not Linked,Şirket Bağlı Değil,
+Import Chart of Accounts from CSV / Excel files,Hesap Planını CSV / Excel dosyalarından içe aktarın,
+Completed Qty cannot be greater than 'Qty to Manufacture',Tamamlanan Miktar &quot;Üretilecek Miktar&quot; dan büyük olamaz,
+"Row {0}: For Supplier {1}, Email Address is Required to send an email","Satır {0}: Tedarikçi {1} için, e-posta göndermek için E-posta Adresi Gereklidir",
diff --git a/erpnext/translations/uk.csv b/erpnext/translations/uk.csv
index 5d14ddf..2cc6476 100644
--- a/erpnext/translations/uk.csv
+++ b/erpnext/translations/uk.csv
@@ -521,7 +521,6 @@
 Chargeble,Зарядний,
 Charges are updated in Purchase Receipt against each item,Збори у прихідній накладній оновлюються по кожній позиції,
 "Charges will be distributed proportionately based on item qty or amount, as per your selection","Збори будуть розподілені пропорційно на основі к-сті або суми, за Вашим вибором",
-Chart Of Accounts,План рахунків,
 Chart of Cost Centers,Перелік центрів витрат,
 Check all,Перевірити все,
 Checkout,Перевірити,
@@ -581,7 +580,6 @@
 Compensatory Off,Компенсаційні Викл,
 Compensatory leave request days not in valid holidays,Заявки на компенсаційну відпустку не діють на дійсних вихідних днях,
 Complaint,Скарга,
-Completed Qty can not be greater than 'Qty to Manufacture',"Завершена к-сть не може бути більше, ніж ""к-сть для виробництва""",
 Completion Date,Дата Виконання,
 Computer,Комп&#39;ютер,
 Condition,Стан,
@@ -2033,7 +2031,6 @@
 Please select Charge Type first,"Будь ласка, виберіть спочатку тип стягнення",
 Please select Company,"Будь ласка, виберіть компанію",
 Please select Company and Designation,"Будь ласка, виберіть компанію та позначення",
-Please select Company and Party Type first,"Будь ласка, виберіть компанію та контрагента спершу",
 Please select Company and Posting Date to getting entries,"Будь ласка, виберіть компанію та дату публікації, щоб отримувати записи",
 Please select Company first,"Будь ласка, виберіть компанію спочатку",
 Please select Completion Date for Completed Asset Maintenance Log,"Будь ласка, виберіть Дата завершення для завершеного журналу обслуговування активів",
@@ -2980,7 +2977,6 @@
 The name of your company for which you are setting up this system.,"Назва вашої компанії, для якої ви налаштовуєте цю систему.",
 The number of shares and the share numbers are inconsistent,Кількість акцій та кількість акцій непослідовна,
 The payment gateway account in plan {0} is different from the payment gateway account in this payment request,Платіжний шлюзовий обліковий запис у плані {0} відрізняється від облікового запису шлюзу платежу в цьому платіжному запиті,
-The request for quotation can be accessed by clicking on the following link,"Запит котирувань можна отримати, перейшовши за наступним посиланням",
 The selected BOMs are not for the same item,Вибрані Норми не для тієї ж позиції,
 The selected item cannot have Batch,Обрана номенклатурна позиція не може мати партій,
 The seller and the buyer cannot be the same,Продавець і покупець не можуть бути однаковими,
@@ -3130,7 +3126,6 @@
 Total flexible benefit component amount {0} should not be less than max benefits {1},"Загальна сума гнучких компонентів виплат {0} не повинна бути меншою, ніж максимальна вигода {1}",
 Total hours: {0},Загальна кількість годин: {0},
 Total leaves allocated is mandatory for Leave Type {0},Загальна кількість виділених листів є обов&#39;язковою для типу відпустки {0},
-Total weightage assigned should be 100%. It is {0},Всього weightage призначений повинна бути 100%. Це {0},
 Total working hours should not be greater than max working hours {0},"Всього тривалість робочого часу не повинна бути більше, ніж максимальний робочий час {0}",
 Total {0} ({1}),Підсумок {0} ({1}),
 "Total {0} for all items is zero, may be you should change 'Distribute Charges Based On'","Всього {0} для всіх елементів дорівнює нулю, може бути, ви повинні змінити «Розподілити плату на основі»",
@@ -3544,7 +3539,6 @@
 Company field is required,Поле компанії обов&#39;язкове,
 Creating Dimensions...,Створення розмірів ...,
 Duplicate entry against the item code {0} and manufacturer {1},Дублікат запису проти коду товару {0} та виробника {1},
-Import Chart Of Accounts from CSV / Excel files,Імпорт рахунків з файлів CSV / Excel,
 Invalid GSTIN! The input you've entered doesn't match the GSTIN format for UIN Holders or Non-Resident OIDAR Service Providers,Недійсний GSTIN! Введене вами введення не відповідає формату GSTIN для власників UIN або постачальників послуг OIDAR нерезидентів,
 Invoice Grand Total,Рахунок-фактура Велика сума,
 Last carbon check date cannot be a future date,Остання дата перевірки викидів вуглецю не може бути майбутньою датою,
@@ -3921,7 +3915,6 @@
 Plaid public token error,Помилка публічного маркера,
 Plaid transactions sync error,Помилка синхронізації транзакцій у пладі,
 Please check the error log for details about the import errors,"Перевірте журнал помилок, щоб дізнатись про помилки імпорту",
-Please click on the following link to set your new password,"Будь ласка, натисніть на посилання, щоб встановити новий пароль",
 Please create <b>DATEV Settings</b> for Company <b>{}</b>.,Створіть <b>налаштування DATEV</b> для компанії <b>{}</b> .,
 Please create adjustment Journal Entry for amount {0} ,"Будь ласка, створіть коригувальну запис у журналі на суму {0}",
 Please do not create more than 500 items at a time,"Будь ласка, не створюйте більше 500 елементів одночасно",
@@ -3997,6 +3990,7 @@
 Release date must be in the future,Дата виходу повинна бути в майбутньому,
 Relieving Date must be greater than or equal to Date of Joining,Дата звільнення повинна бути більшою або рівною даті приєднання,
 Rename,Перейменувати,
+Rename Not Allowed,Перейменування не дозволено,
 Repayment Method is mandatory for term loans,Метод погашення є обов&#39;язковим для строкових позик,
 Repayment Start Date is mandatory for term loans,Дата початку погашення є обов&#39;язковою для строкових позик,
 Report Item,Елемент звіту,
@@ -4043,7 +4037,6 @@
 Select All,Вибрати все,
 Select Difference Account,Виберіть Рахунок різниці,
 Select a Default Priority.,Виберіть пріоритет за замовчуванням.,
-Select a Supplier from the Default Supplier List of the items below.,"Виберіть постачальника зі списку постачальників за замовчуванням елементів, наведених нижче.",
 Select a company,Виберіть компанію,
 Select finance book for the item {0} at row {1},Виберіть книгу фінансів для елемента {0} у рядку {1},
 Select only one Priority as Default.,Виберіть лише один пріоритет як за замовчуванням.,
@@ -4247,7 +4240,6 @@
 Actual ,Фактичний,
 Add to cart,Додати в кошик,
 Budget,Бюджет,
-Chart Of Accounts Importer,План імпортера рахунків,
 Chart of Accounts,Діаграма рахунків,
 Customer database.,База даних клієнтів.,
 Days Since Last order,Дні з останнього ордена,
@@ -4546,7 +4538,6 @@
 Check Supplier Invoice Number Uniqueness,Перевіряти унікальність номеру вхідного рахунку-фактури,
 Make Payment via Journal Entry,Платити згідно Проводки,
 Unlink Payment on Cancellation of Invoice,Відвязувати оплати при анулюванні рахунку-фактури,
-Unlink Advance Payment on Cancelation of Order,Від’єднайте авансовий платіж при скасування замовлення,
 Book Asset Depreciation Entry Automatically,Книга активів Амортизація запис автоматично,
 Automatically Add Taxes and Charges from Item Tax Template,Автоматично додавати податки та збори з шаблону податку на предмет,
 Automatically Fetch Payment Terms,Автоматично отримати умови оплати,
@@ -4940,7 +4931,6 @@
 POS Customer Group,POS Група клієнтів,
 POS Field,Поле POS,
 POS Item Group,POS Item Group,
-[Select],[Виберіть],
 Company Address,адреса компанії,
 Update Stock,Оновити запас,
 Ignore Pricing Rule,Ігнорувати цінове правило,
@@ -6481,7 +6471,6 @@
 Appraisal Template,Оцінка шаблону,
 For Employee Name,Для Назва Співробітника,
 Goals,Мети,
-Calculate Total Score,Розрахувати загальну кількість балів,
 Total Score (Out of 5),Всього балів (з 5),
 "Any other remarks, noteworthy effort that should go in the records.","Будь-які інші зауваження, відзначити зусилля, які повинні йти в записах.",
 Appraisal Goal,Оцінка Мета,
@@ -6599,11 +6588,6 @@
 Reason for Leaving,Причина звільнення,
 Leave Encashed?,Оплачуване звільнення?,
 Encashment Date,Дата виплати,
-Exit Interview Details,Деталі співбесіди при звільненні,
-Held On,Проводилася,
-Reason for Resignation,Причина відставки,
-Better Prospects,Кращі перспективи,
-Health Concerns,Проблеми Здоров&#39;я,
 New Workplace,Нове місце праці,
 HR-EAD-.YYYY.-,HR-EAD-.YYYY.-,
 Returned Amount,Повернута сума,
@@ -8239,9 +8223,6 @@
 Manufacturers used in Items,"Виробники, що використовувалися у позиції",
 Limited to 12 characters,Обмежено до 12 символів,
 MAT-MR-.YYYY.-,MAT-MR-.YYYY.-,
-Set Warehouse,Встановити Склад,
-Sets 'For Warehouse' in each row of the Items table.,Встановлює &#39;Для складу&#39; у кожному рядку таблиці Елементи.,
-Requested For,Замовляється для,
 Partially Ordered,Частково впорядковано,
 Transferred,передано,
 % Ordered,% Замовлено,
@@ -8690,8 +8671,6 @@
 Select warehouse for material requests,Виберіть склад для запитів матеріалів,
 Transfer Materials For Warehouse {0},Передати матеріали на склад {0},
 Production Plan Material Request Warehouse,Склад виробничого плану запиту складу,
-Set From Warehouse,Встановити зі складу,
-Source Warehouse (Material Transfer),Склад джерела (передача матеріалів),
 Sets 'Source Warehouse' in each row of the items table.,Встановлює &#39;Склад джерела&#39; у кожному рядку таблиці елементів.,
 Sets 'Target Warehouse' in each row of the items table.,Встановлює &quot;Цільовий склад&quot; у кожному рядку таблиці елементів.,
 Show Cancelled Entries,Показати скасовані записи,
@@ -9157,7 +9136,6 @@
 Is Income Tax Component,Є складовою податку на прибуток,
 Component properties and references ,Властивості компонента та посилання,
 Additional Salary ,Додаткова зарплата,
-Condtion and formula,Стан і формула,
 Unmarked days,Непозначені дні,
 Absent Days,Відсутні дні,
 Conditions and Formula variable and example,Умови та формула змінна та приклад,
@@ -9444,7 +9422,6 @@
 Please check your Plaid client ID and secret values,"Будь ласка, перевірте свій ідентифікатор клієнта Plaid та секретні значення",
 Bank transaction creation error,Помилка створення банківської операції,
 Unit of Measurement,Одиниця виміру,
-Row #{}: Selling rate for item {} is lower than its {}. Selling rate should be atleast {},"Рядок № {}: коефіцієнт продажу товару {} нижчий, ніж {}. Курс продажу повинен бути не менше {}",
 Fiscal Year {0} Does Not Exist,Фінансовий рік {0} не існує,
 Row # {0}: Returned Item {1} does not exist in {2} {3},Рядок № {0}: повернутий товар {1} не існує в {2} {3},
 Valuation type charges can not be marked as Inclusive,Оплата за тип оцінки не може бути позначена як Включна,
@@ -9598,8 +9575,60 @@
 Response Time for {0} priority in row {1} can't be greater than Resolution Time.,Час відповіді для {0} пріоритету в рядку {1} не може бути більше часу роздільної здатності.,
 {0} is not enabled in {1},{0} не ввімкнено в {1},
 Group by Material Request,Групувати за запитом на матеріали,
-"Row {0}: For Supplier {0}, Email Address is Required to Send Email",Рядок {0}: для постачальника {0} для надсилання електронної пошти потрібна електронна адреса,
 Email Sent to Supplier {0},"Електронний лист, надісланий постачальнику {0}",
 "The Access to Request for Quotation From Portal is Disabled. To Allow Access, Enable it in Portal Settings.","Доступ до запиту на пропозицію з порталу відключений. Щоб дозволити доступ, увімкніть його в налаштуваннях порталу.",
 Supplier Quotation {0} Created,Котирування постачальника {0} Створено,
 Valid till Date cannot be before Transaction Date,Діє до дати не може бути до дати транзакції,
+Unlink Advance Payment on Cancellation of Order,Від’єднайте авансовий платіж у разі скасування замовлення,
+"Simple Python Expression, Example: territory != 'All Territories'","Простий вираз Python, Приклад: территорія! = &#39;Усі території&#39;",
+Sales Contributions and Incentives,Внесок та стимулювання збуту,
+Sourced by Supplier,Джерело постачальника,
+Total weightage assigned should be 100%.<br>It is {0},Загальна призначена вага повинна становити 100%.<br> Це {0},
+Account {0} exists in parent company {1}.,Обліковий запис {0} існує в материнській компанії {1}.,
+"To overrule this, enable '{0}' in company {1}","Щоб скасувати це, увімкніть &quot;{0}&quot; у компанії {1}",
+Invalid condition expression,Недійсний вираз умови,
+Please Select a Company First,"Будь ласка, спершу виберіть компанію",
+Please Select Both Company and Party Type First,"Будь ласка, спочатку виберіть тип компанії та партії",
+Provide the invoice portion in percent,Надайте частину рахунку-фактури у відсотках,
+Give number of days according to prior selection,Вкажіть кількість днів відповідно до попереднього відбору,
+Email Details,Деталі електронної пошти,
+"Select a greeting for the receiver. E.g. Mr., Ms., etc.","Виберіть привітання для приймача. Наприклад, пан, пані та ін.",
+Preview Email,Попередній перегляд електронної пошти,
+Please select a Supplier,Виберіть постачальника,
+Supplier Lead Time (days),Час виконання постачальника (дні),
+"Home, Work, etc.","Дім, робота тощо.",
+Exit Interview Held On,Вихідне інтерв’ю проведено,
+Condition and formula,Умова і формула,
+Sets 'Target Warehouse' in each row of the Items table.,Встановлює &#39;Цільовий склад&#39; у кожному рядку таблиці Елементи.,
+Sets 'Source Warehouse' in each row of the Items table.,Встановлює &#39;Source Warehouse&#39; у кожному рядку таблиці Items.,
+POS Register,POS-реєстр,
+"Can not filter based on POS Profile, if grouped by POS Profile","Неможливо відфільтрувати на основі POS-профілю, якщо згруповано за POS-профілем",
+"Can not filter based on Customer, if grouped by Customer","Неможливо відфільтрувати на основі Клієнта, якщо згруповано за Клієнтом",
+"Can not filter based on Cashier, if grouped by Cashier","Неможливо відфільтрувати на основі каси, якщо згруповано за касою",
+Payment Method,Спосіб оплати,
+"Can not filter based on Payment Method, if grouped by Payment Method","Неможливо відфільтрувати на основі способу оплати, якщо згруповано за способом оплати",
+Supplier Quotation Comparison,Порівняння котирувань постачальників,
+Price per Unit (Stock UOM),Ціна за одиницю (запас UOM),
+Group by Supplier,Групування за постачальником,
+Group by Item,Групувати за елементами,
+Remember to set {field_label}. It is required by {regulation}.,Не забудьте встановити {field_label}. Це вимагається {регламентом}.,
+Enrollment Date cannot be before the Start Date of the Academic Year {0},Дата зарахування не може бути до дати початку навчального року {0},
+Enrollment Date cannot be after the End Date of the Academic Term {0},Дата зарахування не може бути після дати закінчення академічного терміну {0},
+Enrollment Date cannot be before the Start Date of the Academic Term {0},Дата зарахування не може бути до дати початку академічного терміну {0},
+Posting future transactions are not allowed due to Immutable Ledger,Опублікування майбутніх транзакцій заборонено через незмінній книзі,
+Future Posting Not Allowed,Опублікування в майбутньому не дозволяється,
+"To enable Capital Work in Progress Accounting, ","Щоб увімкнути облік незавершеного капіталу,",
+you must select Capital Work in Progress Account in accounts table,у таблиці рахунків потрібно вибрати рахунок «Облік незавершеного капіталу»,
+You can also set default CWIP account in Company {},Ви також можете встановити обліковий запис CWIP за замовчуванням у компанії {},
+The Request for Quotation can be accessed by clicking on the following button,"Запит на пропозицію можна отримати, натиснувши наступну кнопку",
+Regards,З повагою,
+Please click on the following button to set your new password,"Натисніть наступну кнопку, щоб встановити новий пароль",
+Update Password,Оновити пароль,
+Row #{}: Selling rate for item {} is lower than its {}. Selling {} should be atleast {},"Рядок № {}: коефіцієнт продажу товару {} нижчий, ніж {}. Продаж {} повинен бути принаймні {}",
+You can alternatively disable selling price validation in {} to bypass this validation.,"Ви можете також вимкнути перевірку ціни продажу в {}, щоб обійти це підтвердження.",
+Invalid Selling Price,Недійсна ціна продажу,
+Address needs to be linked to a Company. Please add a row for Company in the Links table.,"Адреса повинна бути пов’язана з компанією. Будь ласка, додайте рядок для компанії в таблиці посилань.",
+Company Not Linked,Компанія не пов’язана,
+Import Chart of Accounts from CSV / Excel files,Імпортуйте план рахунків із файлів CSV / Excel,
+Completed Qty cannot be greater than 'Qty to Manufacture',Заповнена кількість не може бути більшою за &quot;Кількість для виготовлення&quot;,
+"Row {0}: For Supplier {1}, Email Address is Required to send an email",Рядок {0}: для постачальника {1} для надсилання електронного листа потрібна електронна адреса,
diff --git a/erpnext/translations/ur.csv b/erpnext/translations/ur.csv
index c81f3a4..52b5507 100644
--- a/erpnext/translations/ur.csv
+++ b/erpnext/translations/ur.csv
@@ -521,7 +521,6 @@
 Chargeble,چارج کرنے والا۔,
 Charges are updated in Purchase Receipt against each item,چارجز ہر شے کے خلاف خریداری کی رسید میں اپ ڈیٹ کیا جاتا ہے,
 "Charges will be distributed proportionately based on item qty or amount, as per your selection",چارجز تناسب اپنے انتخاب کے مطابق، شے کی مقدار یا رقم کی بنیاد پر تقسیم کیا جائے گا,
-Chart Of Accounts,اکاؤنٹس کا چارٹ,
 Chart of Cost Centers,لاگت کے مراکز کا چارٹ,
 Check all,تمام چیک کریں,
 Checkout,اس کو دیکھو,
@@ -581,7 +580,6 @@
 Compensatory Off,مائکر آف,
 Compensatory leave request days not in valid holidays,معاوضہ کی درخواست کی درخواست درست تعطیلات میں نہیں,
 Complaint,شکایت,
-Completed Qty can not be greater than 'Qty to Manufacture',کے مقابلے میں &#39;مقدار تعمیر کرنے&#39; مکمل مقدار زیادہ نہیں ہو سکتا,
 Completion Date,تکمیل کی تاریخ,
 Computer,کمپیوٹر,
 Condition,حالت,
@@ -2033,7 +2031,6 @@
 Please select Charge Type first,سب سے پہلے انچارج قسم منتخب کریں,
 Please select Company,کمپنی کا انتخاب کریں,
 Please select Company and Designation,براہ مہربانی کمپنی اور عہدہ کا انتخاب کریں,
-Please select Company and Party Type first,پہلی کمپنی اور پارٹی کی قسم منتخب کریں,
 Please select Company and Posting Date to getting entries,برائے مہربانی اندراجات حاصل کرنے کے لئے کمپنی اور پوسٹنگ کی تاریخ کا انتخاب کریں,
 Please select Company first,پہلی کمپنی کا انتخاب کریں,
 Please select Completion Date for Completed Asset Maintenance Log,مکمل شدہ اثاثہ کی بحالی کی لاگت کے لئے براہ کرم تاریخ کا انتخاب کریں,
@@ -2980,7 +2977,6 @@
 The name of your company for which you are setting up this system.,آپ کی کمپنی کے نام جس کے لئے آپ کو اس کے نظام کو قائم کر رہے ہیں.,
 The number of shares and the share numbers are inconsistent,حصص کی تعداد اور حصص کی تعداد متضاد ہیں,
 The payment gateway account in plan {0} is different from the payment gateway account in this payment request,ادائیگی میں گیٹ وے اکاؤنٹ {0} اس ادائیگی کی درخواست میں ادائیگی کے گیٹ وے اکاؤنٹ سے مختلف ہے,
-The request for quotation can be accessed by clicking on the following link,کوٹیشن کے لئے درخواست مندرجہ ذیل لنک پر کلک کر کے حاصل کیا جا سکتا,
 The selected BOMs are not for the same item,منتخب شدہ BOMs ہی شے کے لئے نہیں ہیں,
 The selected item cannot have Batch,منتخب شے بیچ نہیں کر سکتے ہیں,
 The seller and the buyer cannot be the same,بیچنے والا اور خریدار ایک ہی نہیں ہو سکتا,
@@ -3130,7 +3126,6 @@
 Total flexible benefit component amount {0} should not be less than max benefits {1},کل لچکدار فائدہ جزو رقم {0} زیادہ سے زیادہ فوائد سے کم نہیں ہونا چاہئے {1},
 Total hours: {0},کل گھنٹے: {0},
 Total leaves allocated is mandatory for Leave Type {0},اختتام شدہ کل پتیوں کو چھوڑنے کی قسم {0} کے لئے لازمی ہے.,
-Total weightage assigned should be 100%. It is {0},100٪ ہونا چاہئے تفویض کل اہمیت. یہ {0},
 Total working hours should not be greater than max working hours {0},کل کام کرنے کا گھنٹوں زیادہ سے زیادہ کام کے گھنٹوں سے زیادہ نہیں ہونا چاہئے {0},
 Total {0} ({1}),کل {0} ({1}),
 "Total {0} for all items is zero, may be you should change 'Distribute Charges Based On'",تمام اشیاء کے لئے کل {0} صفر ہے، کیا آپ کو تبدیل کرنا چاہئے &#39;پر مبنی چارج تقسیم&#39;,
@@ -3544,7 +3539,6 @@
 Company field is required,کمپنی کا فیلڈ درکار ہے۔,
 Creating Dimensions...,طول و عرض کی تشکیل…,
 Duplicate entry against the item code {0} and manufacturer {1},آئٹم کوڈ {0} اور کارخانہ دار {1 against کے خلاف نقل کا اندراج,
-Import Chart Of Accounts from CSV / Excel files,CSV / ایکسل فائلوں سے اکاؤنٹس کا چارٹ درآمد کریں۔,
 Invalid GSTIN! The input you've entered doesn't match the GSTIN format for UIN Holders or Non-Resident OIDAR Service Providers,غلط جی ایس ٹی این! آپ نے جو ان پٹ داخل کیا ہے وہ UIN ہولڈرز یا غیر رہائشی OIDAR سروس فراہم کرنے والے کیلئے GSTIN فارمیٹ سے مماثل نہیں ہے۔,
 Invoice Grand Total,انوائس گرینڈ ٹوٹل,
 Last carbon check date cannot be a future date,آخری کاربن چیک کی تاریخ آئندہ تاریخ نہیں ہوسکتی ہے۔,
@@ -3921,7 +3915,6 @@
 Plaid public token error,عوامی طور پر ٹوکن غلطی لگائیں۔,
 Plaid transactions sync error,پلیڈ ٹرانزیکشن کی مطابقت پذیری کی خرابی۔,
 Please check the error log for details about the import errors,براہ کرم درآمدی غلطیوں کے بارے میں تفصیلات کے ل error غلطی لاگ کو چیک کریں۔,
-Please click on the following link to set your new password,اپنا نیا پاس ورڈ مقرر کرنے کے لئے مندرجہ ذیل لنک پر کلک کریں براہ مہربانی,
 Please create <b>DATEV Settings</b> for Company <b>{}</b>.,براہ کرم کمپنی for for کے لئے <b>DETV ترتیبات</b> تشکیل <b>دیں</b> ۔,
 Please create adjustment Journal Entry for amount {0} ,براہ کرم رقم for 0 for کیلئے ایڈجسٹمنٹ جرنل انٹری بنائیں,
 Please do not create more than 500 items at a time,براہ کرم ایک وقت میں 500 سے زیادہ آئٹمز نہ بنائیں۔,
@@ -3997,6 +3990,7 @@
 Release date must be in the future,رہائی کی تاریخ مستقبل میں ہونی چاہئے۔,
 Relieving Date must be greater than or equal to Date of Joining,تاریخ چھٹکارا شامل ہونے کی تاریخ سے زیادہ یا اس کے برابر ہونا چاہئے,
 Rename,نام تبدیل کریں,
+Rename Not Allowed,نام تبدیل کرنے کی اجازت نہیں ہے۔,
 Repayment Method is mandatory for term loans,مدتی قرضوں کے لئے ادائیگی کا طریقہ لازمی ہے,
 Repayment Start Date is mandatory for term loans,مدتی قرضوں کے لئے ادائیگی شروع کرنے کی تاریخ لازمی ہے,
 Report Item,آئٹم کی اطلاع دیں۔,
@@ -4043,7 +4037,6 @@
 Select All,تمام منتخب کریں,
 Select Difference Account,فرق اکاؤنٹ منتخب کریں۔,
 Select a Default Priority.,پہلے سے طے شدہ ترجیح منتخب کریں۔,
-Select a Supplier from the Default Supplier List of the items below.,ذیل میں آئٹمز کی ڈیفالٹ سپلائر لسٹ سے ایک سپلائر منتخب کریں۔,
 Select a company,کمپنی منتخب کریں۔,
 Select finance book for the item {0} at row {1},صف {1} پر آئٹم {0} کیلئے فنانس بک منتخب کریں,
 Select only one Priority as Default.,بطور ڈیفالٹ صرف ایک ترجیح منتخب کریں۔,
@@ -4247,7 +4240,6 @@
 Actual ,اصل,
 Add to cart,ٹوکری میں شامل کریں,
 Budget,بجٹ,
-Chart Of Accounts Importer,اکاؤنٹ کا درآمد کرنے والا چارٹ۔,
 Chart of Accounts,اکاؤنٹس کا چارٹ,
 Customer database.,کسٹمر ڈیٹا بیس.,
 Days Since Last order,آخری آرڈر کے بعد دن,
@@ -4546,7 +4538,6 @@
 Check Supplier Invoice Number Uniqueness,چیک سپلائر انوائس نمبر انفرادیت,
 Make Payment via Journal Entry,جرنل اندراج کے ذریعے ادائیگی,
 Unlink Payment on Cancellation of Invoice,انوائس کی منسوخی پر ادائیگی کا لنک ختم کریں,
-Unlink Advance Payment on Cancelation of Order,آرڈر کی منسوخی پر ایڈوانس ادائیگی کو لنک سے جوڑیں۔,
 Book Asset Depreciation Entry Automatically,کتاب اثاثہ ہراس اندراج خودکار طور پر,
 Automatically Add Taxes and Charges from Item Tax Template,آئٹم ٹیکس ٹیمپلیٹ سے خودکار طور پر ٹیکس اور چارجز شامل کریں۔,
 Automatically Fetch Payment Terms,ادائیگی کی شرائط خود بخود بازیافت کریں۔,
@@ -4940,7 +4931,6 @@
 POS Customer Group,POS گاہک گروپ,
 POS Field,POS فیلڈ,
 POS Item Group,POS آئٹم گروپ,
-[Select],[چونے],
 Company Address,کمپنی ایڈریس,
 Update Stock,اپ ڈیٹ اسٹاک,
 Ignore Pricing Rule,قیمتوں کا تعین اصول نظر انداز,
@@ -6481,7 +6471,6 @@
 Appraisal Template,تشخیص سانچہ,
 For Employee Name,ملازم کے نام کے لئے,
 Goals,اہداف,
-Calculate Total Score,کل اسکور کا حساب لگائیں,
 Total Score (Out of 5),(5 میں سے) کل اسکور,
 "Any other remarks, noteworthy effort that should go in the records.",کسی بھی دوسرے ریمارکس، ریکارڈ میں جانا چاہئے کہ قابل ذکر کوشش.,
 Appraisal Goal,تشخیص گول,
@@ -6599,11 +6588,6 @@
 Reason for Leaving,جانے کی وجہ,
 Leave Encashed?,Encashed چھوڑ دیں؟,
 Encashment Date,معاوضہ تاریخ,
-Exit Interview Details,باہر نکلیں انٹرویو کی تفصیلات,
-Held On,مقبوضہ پر,
-Reason for Resignation,استعفی کی وجہ,
-Better Prospects,بہتر امکانات,
-Health Concerns,صحت کے خدشات,
 New Workplace,نئے کام کی جگہ,
 HR-EAD-.YYYY.-,HR-EAD -YYYY.-,
 Returned Amount,رقم واپس کردی,
@@ -8239,9 +8223,6 @@
 Manufacturers used in Items,اشیاء میں استعمال کیا مینوفیکچررز,
 Limited to 12 characters,12 حروف تک محدود,
 MAT-MR-.YYYY.-,میٹ - ایم آر- .YYYY-,
-Set Warehouse,گودام مقرر کریں,
-Sets 'For Warehouse' in each row of the Items table.,آئٹمز ٹیبل کی ہر صف میں &#39;گودام کے لئے&#39; سیٹ کریں۔,
-Requested For,کے لئے درخواست,
 Partially Ordered,جزوی طور پر حکم دیا گیا,
 Transferred,منتقل,
 % Ordered,٪سامان آرڈرھوگیا,
@@ -8690,8 +8671,6 @@
 Select warehouse for material requests,مادی درخواستوں کے لئے گودام کا انتخاب کریں,
 Transfer Materials For Warehouse {0},گودام For 0 For کے لئے مواد کی منتقلی,
 Production Plan Material Request Warehouse,پروڈکشن پلان میٹریل ریکوسٹ گودام,
-Set From Warehouse,گودام سے سیٹ کریں,
-Source Warehouse (Material Transfer),ماخذ گودام (مواد کی منتقلی),
 Sets 'Source Warehouse' in each row of the items table.,آئٹمز ٹیبل کی ہر صف میں &#39;سورس گودام&#39; سیٹ کریں۔,
 Sets 'Target Warehouse' in each row of the items table.,آئٹمز ٹیبل کی ہر صف میں &#39;ٹارگٹ گودام&#39; سیٹ کریں۔,
 Show Cancelled Entries,منسوخ اندراجات دکھائیں,
@@ -9157,7 +9136,6 @@
 Is Income Tax Component,انکم ٹیکس کا جز ہے,
 Component properties and references ,اجزاء کی خصوصیات اور حوالہ جات,
 Additional Salary ,اضافی تنخواہ,
-Condtion and formula,حالت اور فارمولا,
 Unmarked days,نشان زد دن,
 Absent Days,غائب دن,
 Conditions and Formula variable and example,ضوابط اور فارمولہ متغیر اور مثال,
@@ -9444,7 +9422,6 @@
 Please check your Plaid client ID and secret values,براہ کرم اپنا پلیڈ کلائنٹ کا ID اور خفیہ اقدار دیکھیں,
 Bank transaction creation error,بینک ٹرانزیکشن تخلیق میں خرابی,
 Unit of Measurement,پیما ئش کا یونٹ,
-Row #{}: Selling rate for item {} is lower than its {}. Selling rate should be atleast {},قطار # {}: آئٹم {for کے لئے فروخت کی شرح اس کے {than سے کم ہے۔ فروخت کی شرح کم سے کم be should ہونی چاہئے,
 Fiscal Year {0} Does Not Exist,مالی سال {0} موجود نہیں ہے,
 Row # {0}: Returned Item {1} does not exist in {2} {3},قطار # {0}: واپس شدہ آئٹم {1 {{2} {3 in میں موجود نہیں ہے,
 Valuation type charges can not be marked as Inclusive,قیمت کی قیمت کے معاوضے کو شامل کے طور پر نشان زد نہیں کیا جاسکتا,
@@ -9598,8 +9575,60 @@
 Response Time for {0} priority in row {1} can't be greater than Resolution Time.,جواب 0 row میں ترجیح صف {1 in میں حل وقت سے زیادہ نہیں ہوسکتی ہے۔,
 {0} is not enabled in {1},{1} میں {0 enabled فعال نہیں ہے,
 Group by Material Request,مادی درخواست کے لحاظ سے گروپ,
-"Row {0}: For Supplier {0}, Email Address is Required to Send Email",قطار {0}: فراہم کنندہ {0} کے لئے ، ای میل بھیجنے کے لئے ای میل ایڈریس کی ضرورت ہوتی ہے,
 Email Sent to Supplier {0},ایپلر کو to 0 Supplier فراہم کنندہ کو بھیجا گیا,
 "The Access to Request for Quotation From Portal is Disabled. To Allow Access, Enable it in Portal Settings.",پورٹل سے کوٹیشن کی درخواست تک رسائی غیر فعال ہے۔ رسائی کی اجازت دینے کیلئے ، اسے پورٹل کی ترتیبات میں فعال کریں۔,
 Supplier Quotation {0} Created,سپلائر کوٹیشن {0 ated تشکیل دیا گیا,
 Valid till Date cannot be before Transaction Date,درست تاریخ آج تک لین دین کی تاریخ سے پہلے نہیں ہوسکتی ہے,
+Unlink Advance Payment on Cancellation of Order,آرڈر کی منسوخی پر ایڈوانس ادائیگی کو لنک سے جوڑیں,
+"Simple Python Expression, Example: territory != 'All Territories'",سادہ ازگر اظہار ، مثال کے طور پر: علاقہ! = &#39;تمام خطے&#39;,
+Sales Contributions and Incentives,فروخت میں تعاون اور مراعات,
+Sourced by Supplier,ذریعہ فراہم کنندہ کے ذریعہ,
+Total weightage assigned should be 100%.<br>It is {0},تفویض کردہ مجموعی وزن 100 be ہونا چاہئے۔<br> یہ {0} ہے,
+Account {0} exists in parent company {1}.,اکاؤنٹ {0 parent پیرنٹ کمپنی} 1 in میں موجود ہے۔,
+"To overrule this, enable '{0}' in company {1}",اس کو زیر کرنے کے لئے ، کمپنی in 1 in میں &#39;{0}&#39; کو اہل بنائیں۔,
+Invalid condition expression,غلط شرط اظہار,
+Please Select a Company First,براہ کرم پہلے کمپنی منتخب کریں,
+Please Select Both Company and Party Type First,براہ کرم پہلے کمپنی اور پارٹی کی قسم دونوں کو منتخب کریں,
+Provide the invoice portion in percent,انوائس کا حصہ فیصد میں فراہم کریں,
+Give number of days according to prior selection,پیشگی انتخاب کے مطابق دن کی تعداد دیں,
+Email Details,ای میل کی تفصیلات,
+"Select a greeting for the receiver. E.g. Mr., Ms., etc.",وصول کنندہ کے لئے ایک مبارکباد کا انتخاب کریں۔ جیسے مسٹر ، محترمہ ، وغیرہ۔,
+Preview Email,پیش نظارہ ای میل,
+Please select a Supplier,براہ کرم ایک سپلائر منتخب کریں,
+Supplier Lead Time (days),سپلائی لیڈ ٹائم (دن),
+"Home, Work, etc.",گھر ، کام وغیرہ۔,
+Exit Interview Held On,باہر نکلیں انٹرویو جاری,
+Condition and formula,حالت اور فارمولا,
+Sets 'Target Warehouse' in each row of the Items table.,آئٹمز ٹیبل کی ہر صف میں &#39;ٹارگٹ گودام&#39; سیٹ کریں۔,
+Sets 'Source Warehouse' in each row of the Items table.,آئٹمز ٹیبل کی ہر صف میں &#39;سورس گودام&#39; سیٹ کریں۔,
+POS Register,POS رجسٹر,
+"Can not filter based on POS Profile, if grouped by POS Profile",اگر POS پروفائل کے ذریعہ گروپ بنایا ہوا ہے تو ، POS پروفائل کی بنیاد پر فلٹر نہیں کرسکتے ہیں,
+"Can not filter based on Customer, if grouped by Customer",اگر گاہک کے حساب سے گروپ کیا گیا ہو تو ، کسٹمر کی بنیاد پر فلٹر نہیں کرسکتے ہیں,
+"Can not filter based on Cashier, if grouped by Cashier",کیشئیر کے حساب سے گروپ بنائے جانے پر ، کیشئیر کی بنیاد پر فلٹر نہیں کرسکتے ہیں,
+Payment Method,ادائیگی کا طریقہ,
+"Can not filter based on Payment Method, if grouped by Payment Method",اگر ادائیگی کے طریقہ کار کے مطابق گروپ بندی کی جائے تو ادائیگی کے طریقہ کار پر مبنی فلٹر نہیں کرسکتے ہیں,
+Supplier Quotation Comparison,سپلائر کوٹیشن موازنہ,
+Price per Unit (Stock UOM),فی یونٹ قیمت (اسٹاک UOM),
+Group by Supplier,گروپ بذریعہ سپلائر,
+Group by Item,آئٹم کے لحاظ سے گروپ,
+Remember to set {field_label}. It is required by {regulation}.,{فیلڈ_لیبل set سیٹ کرنا یاد رکھیں۔ اس کی ضرورت {ضابطہ} کے ذریعہ ہے۔,
+Enrollment Date cannot be before the Start Date of the Academic Year {0},اندراج کی تاریخ تعلیمی سال the 0 of کی تاریخ سے پہلے نہیں ہوسکتی ہے,
+Enrollment Date cannot be after the End Date of the Academic Term {0},اندراج کی تاریخ تعلیمی مدت of 0} کی آخری تاریخ کے بعد نہیں ہوسکتی ہے,
+Enrollment Date cannot be before the Start Date of the Academic Term {0},اندراج کی تاریخ تعلیمی مدت the 0} کی شروعات کی تاریخ سے پہلے نہیں ہوسکتی ہے,
+Posting future transactions are not allowed due to Immutable Ledger,ناقابل منتظم لیجر کی وجہ سے مستقبل میں لین دین کی اشاعت کی اجازت نہیں ہے,
+Future Posting Not Allowed,مستقبل میں پوسٹنگ کی اجازت نہیں ہے,
+"To enable Capital Work in Progress Accounting, ",ترقیاتی اکاؤنٹنگ میں کیپٹل ورک کو فعال کرنے کے ل، ،,
+you must select Capital Work in Progress Account in accounts table,آپ اکاؤنٹس ٹیبل میں کیپٹل ورک ان پروگریس اکاؤنٹ کا انتخاب کریں,
+You can also set default CWIP account in Company {},آپ کمپنی in in میں ڈیفالٹ CWIP اکاؤنٹ بھی مرتب کرسکتے ہیں۔,
+The Request for Quotation can be accessed by clicking on the following button,درج ذیل بٹن پر کلک کرکے کوٹیشن کی درخواست تک رسائی حاصل کی جاسکتی ہے,
+Regards,حوالے,
+Please click on the following button to set your new password,براہ کرم اپنا نیا پاس ورڈ ترتیب دینے کے لئے درج ذیل بٹن پر کلک کریں,
+Update Password,پاس ورڈ کو اپ ڈیٹ کریں,
+Row #{}: Selling rate for item {} is lower than its {}. Selling {} should be atleast {},قطار # {}: آئٹم {for کے لئے فروخت کی شرح اس کے {than سے کم ہے۔ بیچنا Se le کم از کم ہونا چاہئے {},
+You can alternatively disable selling price validation in {} to bypass this validation.,آپ اس توثیق کو نظرانداز کرنے کے ل You متبادل قیمت کو valid in میں غیر فعال کرسکتے ہیں۔,
+Invalid Selling Price,بیچنے کی غلط قیمت,
+Address needs to be linked to a Company. Please add a row for Company in the Links table.,ایڈریس کو کسی کمپنی سے منسلک کرنے کی ضرورت ہے۔ براہ کرم روابط ٹیبل میں کمپنی کے لئے ایک قطار شامل کریں۔,
+Company Not Linked,کمپنی لنکڈ نہیں ہے,
+Import Chart of Accounts from CSV / Excel files,CSV / ایکسل فائلوں سے اکاؤنٹس کا چارٹ درآمد کریں,
+Completed Qty cannot be greater than 'Qty to Manufacture',تکمیل شدہ مقدار &#39;مقدار سے تیاری&#39; سے زیادہ نہیں ہوسکتی ہے,
+"Row {0}: For Supplier {1}, Email Address is Required to send an email",قطار {0}: فراہم کنندہ {1} کے لئے ، ای میل بھیجنے کے لئے ای میل ایڈریس کی ضرورت ہوتی ہے,
diff --git a/erpnext/translations/uz.csv b/erpnext/translations/uz.csv
index affbcfe..fde1e7f 100644
--- a/erpnext/translations/uz.csv
+++ b/erpnext/translations/uz.csv
@@ -521,7 +521,6 @@
 Chargeble,Zaryad,
 Charges are updated in Purchase Receipt against each item,To&#39;lovlar har bir elementga nisbatan Buyurtmachnomada yangilanadi,
 "Charges will be distributed proportionately based on item qty or amount, as per your selection",Narxlar Sizning tanlovingiz bo&#39;yicha mahsulot miqdori yoki miqdori bo&#39;yicha mutanosib ravishda taqsimlanadi,
-Chart Of Accounts,Hisob jadvali,
 Chart of Cost Centers,Xarajat markazlari jadvali,
 Check all,Barchasini tekshiring,
 Checkout,Tekshirib ko&#39;rmoq,
@@ -581,7 +580,6 @@
 Compensatory Off,Compensatory Off,
 Compensatory leave request days not in valid holidays,Kompensatsion ta&#39;til talablari joriy bayramlarda emas,
 Complaint,Shikoyat,
-Completed Qty can not be greater than 'Qty to Manufacture',Tugallangan Miqdor &quot;Katta ishlab chiqarish&quot; dan katta bo&#39;lishi mumkin emas,
 Completion Date,Tugatish sanasi,
 Computer,Kompyuter,
 Condition,Vaziyat,
@@ -2033,7 +2031,6 @@
 Please select Charge Type first,"Marhamat qilib, oldin Zaryadlovchi turi-ni tanlang",
 Please select Company,"Iltimos, Kompaniya-ni tanlang",
 Please select Company and Designation,"Marhamat, Kompaniya va Belgilash-ni tanlang",
-Please select Company and Party Type first,Marhamat qilib Kompaniya va Partiya turini tanlang,
 Please select Company and Posting Date to getting entries,Yozuvlar olish uchun Kompaniya va Xabar yuborish tarixini tanlang,
 Please select Company first,"Iltimos, kompaniyani tanlang",
 Please select Completion Date for Completed Asset Maintenance Log,Tugallangan aktivlarga xizmat ko&#39;rsatish jurnalining tugallangan kunini tanlang,
@@ -2980,7 +2977,6 @@
 The name of your company for which you are setting up this system.,Ushbu tizimni o&#39;rnatayotgan kompaniyangizning nomi.,
 The number of shares and the share numbers are inconsistent,Aktsiyalar soni va aktsiyalarning soni nomuvofiqdir,
 The payment gateway account in plan {0} is different from the payment gateway account in this payment request,{0} da to&#39;lov gateway hisobi ushbu to&#39;lov bo&#39;yicha so&#39;rovda to&#39;lov shluzi hisobidan farq qiladi,
-The request for quotation can be accessed by clicking on the following link,Qo&#39;shtirnoq so&#39;roviga quyidagi havolani bosish orqali kirish mumkin,
 The selected BOMs are not for the same item,Tanlangan BOMlar bir xil element uchun emas,
 The selected item cannot have Batch,Tanlangan elementda partiyalar mavjud emas,
 The seller and the buyer cannot be the same,Sotuvchi va xaridor bir xil bo&#39;lishi mumkin emas,
@@ -3130,7 +3126,6 @@
 Total flexible benefit component amount {0} should not be less than max benefits {1},Jami moslashuvchan foyda komponenti {0} maksimal foydadan kam bo&#39;lmasligi kerak {1},
 Total hours: {0},Umumiy soatlar: {0},
 Total leaves allocated is mandatory for Leave Type {0},Berilgan barglarning barchasi {0} to`lash toifasi uchun majburiydir.,
-Total weightage assigned should be 100%. It is {0},Belgilangan jami vaznda 100% bo&#39;lishi kerak. Bu {0},
 Total working hours should not be greater than max working hours {0},Umumiy ish soatlari eng ko&#39;p ish vaqti {0} dan ortiq bo&#39;lmasligi kerak,
 Total {0} ({1}),Jami {0} ({1}),
 "Total {0} for all items is zero, may be you should change 'Distribute Charges Based On'","Barcha elementlar uchun {0} nolga teng bo&#39;lsa, siz &quot;Distribute Charges Based On&quot;",
@@ -3544,7 +3539,6 @@
 Company field is required,Kompaniya maydoni to&#39;ldirilishi shart,
 Creating Dimensions...,O&#39;lchovlar yaratilmoqda ...,
 Duplicate entry against the item code {0} and manufacturer {1},{0} va ishlab chiqaruvchi {1} kod kodiga kiritilgan yozuvni nusxalash,
-Import Chart Of Accounts from CSV / Excel files,Hisoblar jadvalini CSV / Excel fayllaridan import qiling,
 Invalid GSTIN! The input you've entered doesn't match the GSTIN format for UIN Holders or Non-Resident OIDAR Service Providers,Noto‘g‘ri GSTIN! Siz kiritgan kirish qiymati UIN egalari yoki norezident OIDAR provayderlari uchun GSTIN formatiga mos kelmadi,
 Invoice Grand Total,Hisob-fakturaning umumiy summasi,
 Last carbon check date cannot be a future date,Uglerodni oxirgi tekshirish sanasi kelajakdagi sana bo&#39;lolmaydi,
@@ -3921,7 +3915,6 @@
 Plaid public token error,Umumiy ochiq token xatosi,
 Plaid transactions sync error,Plaid bitimlarini sinxronlashda xato,
 Please check the error log for details about the import errors,"Iltimos, import xatolariga oid tafsilotlar uchun xatolar jurnalini tekshiring",
-Please click on the following link to set your new password,Yangi parolni o&#39;rnatish uchun quyidagi havolani bosing,
 Please create <b>DATEV Settings</b> for Company <b>{}</b>.,Iltimos <b>{}</b> Kompaniya uchun <b>DATEV sozlamalarini</b> yarating.,
 Please create adjustment Journal Entry for amount {0} ,"Iltimos, {0} miqdoriga jurnal yozuvini tuzating.",
 Please do not create more than 500 items at a time,"Iltimos, bir vaqtning o&#39;zida 500 tadan ortiq mahsulot yaratmang",
@@ -3997,6 +3990,7 @@
 Release date must be in the future,Chiqarish sanasi kelajakda bo&#39;lishi kerak,
 Relieving Date must be greater than or equal to Date of Joining,Yengish sanasi qo&#39;shilish sanasidan katta yoki unga teng bo&#39;lishi kerak,
 Rename,Nomni o&#39;zgartiring,
+Rename Not Allowed,Nomni o&#39;zgartirishga ruxsat berilmagan,
 Repayment Method is mandatory for term loans,To&#39;lash usuli muddatli kreditlar uchun majburiydir,
 Repayment Start Date is mandatory for term loans,To&#39;lovni boshlash muddati muddatli kreditlar uchun majburiydir,
 Report Item,Xabar berish,
@@ -4043,7 +4037,6 @@
 Select All,Hammasini belgilash,
 Select Difference Account,Farq hisob qaydnomasini tanlang,
 Select a Default Priority.,Birlamchi ustuvorlikni tanlang.,
-Select a Supplier from the Default Supplier List of the items below.,Quyidagi elementlarning odatiy etkazib beruvchilar ro&#39;yxatidan bir etkazib beruvchini tanlang.,
 Select a company,Kompaniyani tanlang,
 Select finance book for the item {0} at row {1},{1} qatordan {0} uchun moliya kitobini tanlang,
 Select only one Priority as Default.,Odatiy sifatida faqat bitta ustuvorlikni tanlang.,
@@ -4247,7 +4240,6 @@
 Actual ,Haqiqiy,
 Add to cart,Savatchaga qo&#39;shish,
 Budget,Byudjet,
-Chart Of Accounts Importer,Hisob-kitoblarni import qiluvchi sxemasi,
 Chart of Accounts,Hisob jadvalining,
 Customer database.,Mijozlar bazasi.,
 Days Since Last order,Oxirgi Buyurtma berib o&#39;tgan kunlar,
@@ -4546,7 +4538,6 @@
 Check Supplier Invoice Number Uniqueness,Taqdim etuvchi Billing raqami yagonaligini tekshiring,
 Make Payment via Journal Entry,Jurnalga kirish orqali to&#39;lovni amalga oshiring,
 Unlink Payment on Cancellation of Invoice,Billingni bekor qilish bo&#39;yicha to&#39;lovni uzish,
-Unlink Advance Payment on Cancelation of Order,Buyurtmani bekor qilishda avans to&#39;lovini ajratish,
 Book Asset Depreciation Entry Automatically,Kitob aktivlarining amortizatsiyasini avtomatik tarzda kiritish,
 Automatically Add Taxes and Charges from Item Tax Template,Soliq shablonidan avtomatik ravishda soliq va to&#39;lovlarni qo&#39;shing,
 Automatically Fetch Payment Terms,To&#39;lov shartlarini avtomatik ravishda yuklab oling,
@@ -4940,7 +4931,6 @@
 POS Customer Group,Qalin xaridorlar guruhi,
 POS Field,POS maydoni,
 POS Item Group,Qalin modda guruhi,
-[Select],[Tanlash],
 Company Address,Kompaniya manzili,
 Update Stock,Stokni yangilang,
 Ignore Pricing Rule,Raqobatchilar qoidasiga e&#39;tibor bermang,
@@ -6481,7 +6471,6 @@
 Appraisal Template,Baholash shabloni,
 For Employee Name,Ishchi nomi uchun,
 Goals,Maqsadlar,
-Calculate Total Score,Umumiy ballni hisoblash,
 Total Score (Out of 5),Jami ball (5 dan),
 "Any other remarks, noteworthy effort that should go in the records.","Boshqa yozuvlar, yozuvlardagi diqqat-e&#39;tiborli harakatlar.",
 Appraisal Goal,Baholash maqsadi,
@@ -6599,11 +6588,6 @@
 Reason for Leaving,Ketish sababi,
 Leave Encashed?,Encashed qoldiringmi?,
 Encashment Date,Inkassatsiya sanasi,
-Exit Interview Details,Suhbatlashuv ma&#39;lumotidan chiqish,
-Held On,O&#39;chirilgan,
-Reason for Resignation,Istefoning sababi,
-Better Prospects,Yaxshi istiqbolga ega,
-Health Concerns,Sog&#39;liq muammolari,
 New Workplace,Yangi ish joyi,
 HR-EAD-.YYYY.-,HR-EAD-.YYYY.-,
 Returned Amount,Qaytarilgan miqdor,
@@ -8239,9 +8223,6 @@
 Manufacturers used in Items,Ishlab chiqaruvchilar mahsulotda ishlatiladi,
 Limited to 12 characters,12 ta belgi bilan cheklangan,
 MAT-MR-.YYYY.-,MAT-MR-.YYYY.-,
-Set Warehouse,Omborni o&#39;rnating,
-Sets 'For Warehouse' in each row of the Items table.,Ob&#39;ektlar jadvalining har bir qatorida &quot;Ombor uchun&quot; to&#39;plami.,
-Requested For,Talab qilingan,
 Partially Ordered,Qisman buyurtma qilingan,
 Transferred,O&#39;tkazildi,
 % Ordered,% Buyurtma qilingan,
@@ -8690,8 +8671,6 @@
 Select warehouse for material requests,Moddiy talablar uchun omborni tanlang,
 Transfer Materials For Warehouse {0},Ombor uchun materiallar uzatish {0},
 Production Plan Material Request Warehouse,Ishlab chiqarish rejasi Materiallarni talab qilish ombori,
-Set From Warehouse,Ombordan o&#39;rnatish,
-Source Warehouse (Material Transfer),Manba ombori (material uzatish),
 Sets 'Source Warehouse' in each row of the items table.,Mahsulotlar jadvalining har bir qatorida &quot;Manba ombori&quot; ni o&#39;rnatadi.,
 Sets 'Target Warehouse' in each row of the items table.,Mahsulotlar jadvalining har bir qatorida &quot;Maqsadli ombor&quot; ni o&#39;rnatadi.,
 Show Cancelled Entries,Bekor qilingan yozuvlarni ko&#39;rsatish,
@@ -9157,7 +9136,6 @@
 Is Income Tax Component,Daromad solig&#39;ining tarkibiy qismidir,
 Component properties and references ,Komponent xususiyatlari va foydalanilgan adabiyotlar,
 Additional Salary ,Qo&#39;shimcha ish haqi,
-Condtion and formula,Shart va formula,
 Unmarked days,Belgilanmagan kunlar,
 Absent Days,Yo&#39;q kunlar,
 Conditions and Formula variable and example,Shartlar va formulalar o&#39;zgaruvchisi va misol,
@@ -9444,7 +9422,6 @@
 Please check your Plaid client ID and secret values,Plaid mijoz identifikatori va maxfiy qiymatlarini tekshiring,
 Bank transaction creation error,Bank operatsiyalarini tuzishda xato,
 Unit of Measurement,O&#39;lchov birligi,
-Row #{}: Selling rate for item {} is lower than its {}. Selling rate should be atleast {},№ {} qator: {} bandining sotish narxi uning {} dan past. Sotish narxi eng kam bo&#39;lishi kerak {},
 Fiscal Year {0} Does Not Exist,Moliya yili {0} mavjud emas,
 Row # {0}: Returned Item {1} does not exist in {2} {3},№ {0} qator: Qaytgan narsa ({1}) {2} {3} da mavjud emas,
 Valuation type charges can not be marked as Inclusive,Baholash turi uchun to&#39;lovlarni inklyuziv deb belgilash mumkin emas,
@@ -9598,8 +9575,60 @@
 Response Time for {0} priority in row {1} can't be greater than Resolution Time.,{1} qatoridagi {1} ustuvorligi uchun javob vaqti aniqlik vaqtidan oshmasligi kerak.,
 {0} is not enabled in {1},{0} {1} da yoqilmagan,
 Group by Material Request,Materiallar talabi bo&#39;yicha guruhlash,
-"Row {0}: For Supplier {0}, Email Address is Required to Send Email",{0} qatori: Ta&#39;minlovchiga {0} elektron pochta xabarini yuborish uchun elektron pochta manzili talab qilinadi,
 Email Sent to Supplier {0},Yetkazib beruvchiga elektron pochta xabarlari yuborildi {0},
 "The Access to Request for Quotation From Portal is Disabled. To Allow Access, Enable it in Portal Settings.",Portaldan kotirovka so&#39;roviga kirish o&#39;chirilgan. Kirish uchun ruxsat berish uchun uni Portal sozlamalarida yoqing.,
 Supplier Quotation {0} Created,Ta&#39;minlovchining taklifi {0} tuzildi,
 Valid till Date cannot be before Transaction Date,Sana qadar amal qilish muddati bitim sanasidan oldin bo&#39;lishi mumkin emas,
+Unlink Advance Payment on Cancellation of Order,Buyurtmani bekor qilish bo&#39;yicha avans to&#39;lovini uzib qo&#39;ying,
+"Simple Python Expression, Example: territory != 'All Territories'","Python-ning oddiy ifodasi, misol: hudud! = &#39;Barcha hududlar&#39;",
+Sales Contributions and Incentives,Savdoga qo&#39;shadigan hissalar va rag&#39;batlantirish,
+Sourced by Supplier,Yetkazib beruvchi tomonidan etkazib beriladi,
+Total weightage assigned should be 100%.<br>It is {0},Belgilangan umumiy vazn 100% bo&#39;lishi kerak.<br> Bu {0},
+Account {0} exists in parent company {1}.,Hisob {0} bosh kompaniyada mavjud {1}.,
+"To overrule this, enable '{0}' in company {1}",Buni bekor qilish uchun {1} kompaniyasida &quot;{0}&quot; ni yoqing.,
+Invalid condition expression,Noto&#39;g&#39;ri shartli ifoda,
+Please Select a Company First,"Iltimos, avval kompaniyani tanlang",
+Please Select Both Company and Party Type First,"Iltimos, avval kompaniya va partiyaning turini tanlang",
+Provide the invoice portion in percent,Hisob-fakturani foizda taqdim eting,
+Give number of days according to prior selection,Oldingi tanlovga ko&#39;ra kunlar sonini bering,
+Email Details,Elektron pochta tafsilotlari,
+"Select a greeting for the receiver. E.g. Mr., Ms., etc.","Qabul qiluvchilar uchun tabrikni tanlang. Masalan, janob, xonim va boshqalar.",
+Preview Email,Elektron pochtani oldindan ko&#39;rish,
+Please select a Supplier,"Iltimos, etkazib beruvchini tanlang",
+Supplier Lead Time (days),Yetkazib beruvchining etkazib berish muddati (kunlar),
+"Home, Work, etc.","Uy, ish va boshqalar.",
+Exit Interview Held On,Intervyu tugadi,
+Condition and formula,Vaziyat va formulalar,
+Sets 'Target Warehouse' in each row of the Items table.,Ob&#39;ektlar jadvalining har bir qatorida &quot;Maqsadli ombor&quot; ni o&#39;rnatadi.,
+Sets 'Source Warehouse' in each row of the Items table.,Ob&#39;ektlar jadvalining har bir qatorida &quot;Manba ombori&quot; ni o&#39;rnatadi.,
+POS Register,POS Ro&#39;yxatdan o&#39;tish,
+"Can not filter based on POS Profile, if grouped by POS Profile","POS-profil asosida guruhlangan bo&#39;lsa, POS-profil asosida filtrlab bo&#39;lmaydi",
+"Can not filter based on Customer, if grouped by Customer","Mijoz tomonidan guruhlangan bo&#39;lsa, mijoz asosida filtrlab bo&#39;lmaydi",
+"Can not filter based on Cashier, if grouped by Cashier","Kassir tomonidan guruhlangan bo&#39;lsa, Kassir asosida filtrlab bo&#39;lmaydi",
+Payment Method,To&#39;lov uslubi,
+"Can not filter based on Payment Method, if grouped by Payment Method","To&#39;lov usuli bo&#39;yicha guruhlangan bo&#39;lsa, to&#39;lov usuli asosida filtrlash mumkin emas",
+Supplier Quotation Comparison,Yetkazib beruvchilarning narxlarini taqqoslash,
+Price per Unit (Stock UOM),Birlik uchun narx (aktsiya UOM),
+Group by Supplier,Yetkazib beruvchi bo&#39;yicha guruh,
+Group by Item,Moddalar bo&#39;yicha guruhlash,
+Remember to set {field_label}. It is required by {regulation}.,{Field_label} ni o&#39;rnatishni unutmang. Buni {reglament} talab qiladi.,
+Enrollment Date cannot be before the Start Date of the Academic Year {0},Qabul qilish sanasi o&#39;quv yilining boshlanish sanasidan oldin bo&#39;lishi mumkin emas {0},
+Enrollment Date cannot be after the End Date of the Academic Term {0},Qabul qilish sanasi akademik davr tugash sanasidan keyin bo&#39;lishi mumkin emas {0},
+Enrollment Date cannot be before the Start Date of the Academic Term {0},Qabul qilish sanasi akademik davr boshlanish sanasidan oldin bo&#39;lishi mumkin emas {0},
+Posting future transactions are not allowed due to Immutable Ledger,Immutable Ledger tufayli kelajakdagi operatsiyalarni joylashtirishga ruxsat berilmaydi,
+Future Posting Not Allowed,Kelajakdagi xabarlarga ruxsat berilmaydi,
+"To enable Capital Work in Progress Accounting, ","Amalga oshirilayotgan kapitalni hisobga olishni yoqish uchun,",
+you must select Capital Work in Progress Account in accounts table,Hisob-kitoblar jadvalida &quot;Davom etayotgan ishlab chiqarish hisobi&quot; ni tanlashingiz kerak,
+You can also set default CWIP account in Company {},"Shuningdek, siz C} kompaniyasida standart CWIP hisob qaydnomasini o&#39;rnatishingiz mumkin.",
+The Request for Quotation can be accessed by clicking on the following button,Kotirovka uchun so&#39;rovga quyidagi tugmani bosish orqali kirish mumkin,
+Regards,Hurmat bilan,
+Please click on the following button to set your new password,Yangi parolni o&#39;rnatish uchun quyidagi tugmani bosing,
+Update Password,Parolni yangilang,
+Row #{}: Selling rate for item {} is lower than its {}. Selling {} should be atleast {},№ {} qator: {} bandining sotish narxi uning {} dan past. Sotish {} kamida bo&#39;lishi kerak {},
+You can alternatively disable selling price validation in {} to bypass this validation.,"Shu bilan bir qatorda, ushbu tekshiruvni chetlab o&#39;tish uchun {} da sotish narxini tekshirishni o&#39;chirib qo&#39;yishingiz mumkin.",
+Invalid Selling Price,Noto&#39;g&#39;ri sotish narxi,
+Address needs to be linked to a Company. Please add a row for Company in the Links table.,"Manzilni kompaniya bilan bog&#39;lash kerak. Iltimos, havolalar jadvaliga Kompaniya uchun qator qo&#39;shing.",
+Company Not Linked,Kompaniya aloqador emas,
+Import Chart of Accounts from CSV / Excel files,Hisoblar jadvalini CSV / Excel fayllaridan import qilish,
+Completed Qty cannot be greater than 'Qty to Manufacture',Tugallangan miqdor &quot;ishlab chiqarish uchun miqdor&quot; dan katta bo&#39;lishi mumkin emas,
+"Row {0}: For Supplier {1}, Email Address is Required to send an email",{0} qatori: Ta&#39;minlovchiga {1} elektron pochta xabarini yuborish uchun elektron pochta manzili talab qilinadi,
diff --git a/erpnext/translations/vi.csv b/erpnext/translations/vi.csv
index eefd59b..9444204 100644
--- a/erpnext/translations/vi.csv
+++ b/erpnext/translations/vi.csv
@@ -521,7 +521,6 @@
 Chargeble,Bộ sạc,
 Charges are updated in Purchase Receipt against each item,Cước phí được cập nhật trên Phiếu nhận hàng gắn với từng vật tư,
 "Charges will be distributed proportionately based on item qty or amount, as per your selection","Phí sẽ được phân phối không cân xứng dựa trên mục qty hoặc số tiền, theo lựa chọn của bạn",
-Chart Of Accounts,Danh mục tài khoản,
 Chart of Cost Centers,Biểu đồ Bộ phận chi phí,
 Check all,Kiểm tra tất cả,
 Checkout,Kiểm tra,
@@ -581,7 +580,6 @@
 Compensatory Off,Nghỉ làm bù,
 Compensatory leave request days not in valid holidays,Ngày yêu cầu nghỉ phép không có ngày nghỉ hợp lệ,
 Complaint,Lời phàn nàn,
-Completed Qty can not be greater than 'Qty to Manufacture',Đã hoàn thành Số lượng không có thể lớn hơn 'SL đặt Sản xuất',
 Completion Date,Ngày kết thúc,
 Computer,Máy tính,
 Condition,Điều kiện,
@@ -2033,7 +2031,6 @@
 Please select Charge Type first,Vui lòng chọn Loại Charge đầu tiên,
 Please select Company,Vui lòng chọn Công ty,
 Please select Company and Designation,Vui lòng chọn Công ty và Chỉ định,
-Please select Company and Party Type first,Vui lòng chọn Công ty và Đảng Loại đầu tiên,
 Please select Company and Posting Date to getting entries,Vui lòng chọn Công ty và Ngày đăng để nhận các mục nhập,
 Please select Company first,Vui lòng chọn Công ty đầu tiên,
 Please select Completion Date for Completed Asset Maintenance Log,Vui lòng chọn Thời điểm hoàn thành cho nhật ký bảo dưỡng tài sản đã hoàn thành,
@@ -2980,7 +2977,6 @@
 The name of your company for which you are setting up this system.,Tên của công ty bạn đang thiết lập hệ thống này.,
 The number of shares and the share numbers are inconsistent,Số cổ phần và số cổ phần không nhất quán,
 The payment gateway account in plan {0} is different from the payment gateway account in this payment request,Tài khoản cổng thanh toán trong gói {0} khác với tài khoản cổng thanh toán trong yêu cầu thanh toán này,
-The request for quotation can be accessed by clicking on the following link,Các yêu cầu báo giá có thể được truy cập bằng cách nhấp vào liên kết sau,
 The selected BOMs are not for the same item,Các BOMs chọn không cho cùng một mục,
 The selected item cannot have Batch,Các sản phẩm được chọn không thể có hàng loạt,
 The seller and the buyer cannot be the same,Người bán và người mua không thể giống nhau,
@@ -3130,7 +3126,6 @@
 Total flexible benefit component amount {0} should not be less than max benefits {1},Tổng số tiền thành phần lợi ích linh hoạt {0} không được nhỏ hơn lợi ích tối đa {1},
 Total hours: {0},Tổng số giờ: {0},
 Total leaves allocated is mandatory for Leave Type {0},Tổng số lá được phân bổ là bắt buộc đối với Loại bỏ {0},
-Total weightage assigned should be 100%. It is {0},Tổng số trọng lượng ấn định nên là 100%. Nó là {0},
 Total working hours should not be greater than max working hours {0},Tổng số giờ làm việc không nên lớn hơn so với giờ làm việc tối đa {0},
 Total {0} ({1}),Tổng số {0} ({1}),
 "Total {0} for all items is zero, may be you should change 'Distribute Charges Based On'","Tổng số {0} cho tất cả các mặt hàng là số không, có thể bạn nên thay đổi 'Đóng góp cho các loại phí dựa vào '",
@@ -3544,7 +3539,6 @@
 Company field is required,Lĩnh vực công ty là bắt buộc,
 Creating Dimensions...,Tạo kích thước ...,
 Duplicate entry against the item code {0} and manufacturer {1},Mục trùng lặp với mã mục {0} và nhà sản xuất {1},
-Import Chart Of Accounts from CSV / Excel files,Biểu đồ nhập tài khoản từ tệp CSV / Excel,
 Invalid GSTIN! The input you've entered doesn't match the GSTIN format for UIN Holders or Non-Resident OIDAR Service Providers,GSTIN không hợp lệ! Đầu vào bạn đã nhập không khớp với định dạng GSTIN cho Chủ sở hữu UIN hoặc Nhà cung cấp dịch vụ OIDAR không thường trú,
 Invoice Grand Total,Hóa đơn tổng cộng,
 Last carbon check date cannot be a future date,Ngày kiểm tra carbon cuối cùng không thể là một ngày trong tương lai,
@@ -3921,7 +3915,6 @@
 Plaid public token error,Lỗi mã thông báo công khai kẻ sọc,
 Plaid transactions sync error,Lỗi đồng bộ hóa giao dịch kẻ sọc,
 Please check the error log for details about the import errors,Vui lòng kiểm tra nhật ký lỗi để biết chi tiết về các lỗi nhập,
-Please click on the following link to set your new password,Vui lòng click vào các link sau đây để thiết lập mật khẩu mới,
 Please create <b>DATEV Settings</b> for Company <b>{}</b>.,Vui lòng tạo <b>Cài đặt DATEV</b> cho Công ty <b>{}</b> .,
 Please create adjustment Journal Entry for amount {0} ,Vui lòng tạo Nhật ký điều chỉnh cho số tiền {0},
 Please do not create more than 500 items at a time,Vui lòng không tạo hơn 500 mục cùng một lúc,
@@ -3997,6 +3990,7 @@
 Release date must be in the future,Ngày phát hành phải trong tương lai,
 Relieving Date must be greater than or equal to Date of Joining,Ngày giải phóng phải lớn hơn hoặc bằng Ngày tham gia,
 Rename,Đổi tên,
+Rename Not Allowed,Đổi tên không được phép,
 Repayment Method is mandatory for term loans,Phương thức trả nợ là bắt buộc đối với các khoản vay có kỳ hạn,
 Repayment Start Date is mandatory for term loans,Ngày bắt đầu hoàn trả là bắt buộc đối với các khoản vay có kỳ hạn,
 Report Item,Mục báo cáo,
@@ -4043,7 +4037,6 @@
 Select All,Chọn tất cả,
 Select Difference Account,Chọn tài khoản khác biệt,
 Select a Default Priority.,Chọn một ưu tiên mặc định.,
-Select a Supplier from the Default Supplier List of the items below.,Chọn một Nhà cung cấp từ Danh sách nhà cung cấp mặc định của các mục bên dưới.,
 Select a company,Chọn một công ty,
 Select finance book for the item {0} at row {1},Chọn sổ tài chính cho mục {0} ở hàng {1},
 Select only one Priority as Default.,Chỉ chọn một Ưu tiên làm Mặc định.,
@@ -4247,7 +4240,6 @@
 Actual ,Dựa trên tiền thực tế,
 Add to cart,Thêm vào giỏ hàng,
 Budget,Ngân sách,
-Chart Of Accounts Importer,Biểu đồ tài khoản nhập khẩu,
 Chart of Accounts,Biểu đồ tài khoản,
 Customer database.,Cơ sở dữ liệu khách hàng.,
 Days Since Last order,ngày tính từ lần yêu cầu cuối cùng,
@@ -4546,7 +4538,6 @@
 Check Supplier Invoice Number Uniqueness,Kiểm tra nhà cung cấp hóa đơn Số độc đáo,
 Make Payment via Journal Entry,Thanh toán  thông qua bút toán nhập,
 Unlink Payment on Cancellation of Invoice,Bỏ liên kết Thanh toán Hủy hóa đơn,
-Unlink Advance Payment on Cancelation of Order,Hủy liên kết thanh toán tạm ứng khi hủy đơn hàng,
 Book Asset Depreciation Entry Automatically,sách khấu hao tài sản cho bút toán tự động,
 Automatically Add Taxes and Charges from Item Tax Template,Tự động thêm thuế và phí từ mẫu thuế mặt hàng,
 Automatically Fetch Payment Terms,Tự động tìm nạp Điều khoản thanh toán,
@@ -4940,7 +4931,6 @@
 POS Customer Group,Nhóm Khách hàng POS,
 POS Field,Lĩnh vực POS,
 POS Item Group,Nhóm POS,
-[Select],[Chọn],
 Company Address,Địa chỉ công ty,
 Update Stock,Cập nhật hàng tồn kho,
 Ignore Pricing Rule,Bỏ qua điều khoản giá,
@@ -6481,7 +6471,6 @@
 Appraisal Template,Thẩm định mẫu,
 For Employee Name,Cho Tên nhân viên,
 Goals,Mục tiêu,
-Calculate Total Score,Tổng điểm tính toán,
 Total Score (Out of 5),Tổng số điểm ( trong số 5),
 "Any other remarks, noteworthy effort that should go in the records.","Bất kỳ nhận xét khác, nỗ lực đáng chú ý mà nên đi vào biên bản.",
 Appraisal Goal,Thẩm định mục tiêu,
@@ -6599,11 +6588,6 @@
 Reason for Leaving,Lý do Rời đi,
 Leave Encashed?,Chi phiếu đã nhận ?,
 Encashment Date,Encashment Date,
-Exit Interview Details,Chi tiết thoát Phỏng vấn,
-Held On,Được tổ chức vào ngày,
-Reason for Resignation,Lý do từ chức,
-Better Prospects,Triển vọng tốt hơn,
-Health Concerns,Mối quan tâm về sức khỏe,
 New Workplace,Nơi làm việc mới,
 HR-EAD-.YYYY.-,HR-EAD-.YYYY.-,
 Returned Amount,Số tiền trả lại,
@@ -8239,9 +8223,6 @@
 Manufacturers used in Items,Các nhà sản xuất sử dụng trong mục,
 Limited to 12 characters,Hạn chế đến 12 ký tự,
 MAT-MR-.YYYY.-,MAT-MR-.YYYY.-,
-Set Warehouse,Đặt kho,
-Sets 'For Warehouse' in each row of the Items table.,Đặt &#39;Cho Kho hàng&#39; trong mỗi hàng của bảng Mặt hàng.,
-Requested For,Đối với yêu cầu,
 Partially Ordered,Đã đặt hàng một phần,
 Transferred,Đã được vận chuyển,
 % Ordered,% đã đặt,
@@ -8690,8 +8671,6 @@
 Select warehouse for material requests,Chọn kho cho các yêu cầu nguyên liệu,
 Transfer Materials For Warehouse {0},Chuyển Vật liệu Cho Kho {0},
 Production Plan Material Request Warehouse,Kế hoạch sản xuất Yêu cầu vật tư Kho,
-Set From Warehouse,Đặt từ kho,
-Source Warehouse (Material Transfer),Kho Nguồn (Chuyển Vật tư),
 Sets 'Source Warehouse' in each row of the items table.,Đặt &#39;Kho nguồn&#39; trong mỗi hàng của bảng mục.,
 Sets 'Target Warehouse' in each row of the items table.,Đặt &#39;Kho mục tiêu&#39; trong mỗi hàng của bảng mặt hàng.,
 Show Cancelled Entries,Hiển thị các mục đã hủy,
@@ -9157,7 +9136,6 @@
 Is Income Tax Component,Là thành phần thuế thu nhập,
 Component properties and references ,Thuộc tính thành phần và tham chiếu,
 Additional Salary ,Lương bổ sung,
-Condtion and formula,Điều kiện và công thức,
 Unmarked days,Ngày không được đánh dấu,
 Absent Days,Ngày vắng mặt,
 Conditions and Formula variable and example,Điều kiện và biến công thức và ví dụ,
@@ -9444,7 +9422,6 @@
 Please check your Plaid client ID and secret values,Vui lòng kiểm tra ID khách hàng Plaid và các giá trị bí mật của bạn,
 Bank transaction creation error,Lỗi tạo giao dịch ngân hàng,
 Unit of Measurement,Đơn vị đo lường,
-Row #{}: Selling rate for item {} is lower than its {}. Selling rate should be atleast {},Hàng # {}: Tỷ lệ bán được của mặt hàng {} thấp hơn mặt hàng {}. Tỷ lệ bán phải ở mức thấp nhất {},
 Fiscal Year {0} Does Not Exist,Năm tài chính {0} không tồn tại,
 Row # {0}: Returned Item {1} does not exist in {2} {3},Hàng # {0}: Mặt hàng đã trả lại {1} không tồn tại trong {2} {3},
 Valuation type charges can not be marked as Inclusive,Các loại phí định giá không thể được đánh dấu là Bao gồm,
@@ -9598,8 +9575,60 @@
 Response Time for {0} priority in row {1} can't be greater than Resolution Time.,Thời gian phản hồi cho {0} mức độ ưu tiên trong hàng {1} không được lớn hơn Thời gian phân giải.,
 {0} is not enabled in {1},{0} không được bật trong {1},
 Group by Material Request,Nhóm theo Yêu cầu Vật liệu,
-"Row {0}: For Supplier {0}, Email Address is Required to Send Email","Hàng {0}: Đối với Nhà cung cấp {0}, Địa chỉ Email là Bắt buộc để Gửi Email",
 Email Sent to Supplier {0},Email đã được gửi đến nhà cung cấp {0},
 "The Access to Request for Quotation From Portal is Disabled. To Allow Access, Enable it in Portal Settings.","Quyền truy cập để yêu cầu báo giá từ cổng đã bị vô hiệu hóa. Để cho phép truy cập, hãy bật nó trong Cài đặt cổng.",
 Supplier Quotation {0} Created,Báo giá Nhà cung cấp {0} Đã tạo,
 Valid till Date cannot be before Transaction Date,Có giá trị đến Ngày không được trước Ngày giao dịch,
+Unlink Advance Payment on Cancellation of Order,Hủy liên kết thanh toán trước khi hủy đơn hàng,
+"Simple Python Expression, Example: territory != 'All Territories'","Biểu thức Python đơn giản, Ví dụ: lãnh thổ! = &#39;Tất cả các lãnh thổ&#39;",
+Sales Contributions and Incentives,Đóng góp và khuyến khích bán hàng,
+Sourced by Supplier,Nguồn cung cấp bởi nhà cung cấp,
+Total weightage assigned should be 100%.<br>It is {0},Tổng trọng lượng được chỉ định phải là 100%.<br> Đó là {0},
+Account {0} exists in parent company {1}.,Tài khoản {0} tồn tại trong công ty mẹ {1}.,
+"To overrule this, enable '{0}' in company {1}","Để khắc phục điều này, hãy bật &#39;{0}&#39; trong công ty {1}",
+Invalid condition expression,Biểu thức điều kiện không hợp lệ,
+Please Select a Company First,Vui lòng chọn một công ty trước tiên,
+Please Select Both Company and Party Type First,Vui lòng chọn cả Công ty và Loại hình trước,
+Provide the invoice portion in percent,Cung cấp phần hóa đơn theo phần trăm,
+Give number of days according to prior selection,Đưa ra số ngày theo lựa chọn trước,
+Email Details,Chi tiết Email,
+"Select a greeting for the receiver. E.g. Mr., Ms., etc.","Chọn lời chào cho người nhận. Ví dụ: Ông, Bà, v.v.",
+Preview Email,Xem trước Email,
+Please select a Supplier,Vui lòng chọn một nhà cung cấp,
+Supplier Lead Time (days),Thời gian dẫn đầu của nhà cung cấp (ngày),
+"Home, Work, etc.","Nhà riêng, Cơ quan, v.v.",
+Exit Interview Held On,Thoát Phỏng vấn Được tổ chức Vào,
+Condition and formula,Điều kiện và công thức,
+Sets 'Target Warehouse' in each row of the Items table.,Đặt &#39;Kho mục tiêu&#39; trong mỗi hàng của bảng Mặt hàng.,
+Sets 'Source Warehouse' in each row of the Items table.,Đặt &#39;Kho nguồn&#39; trong mỗi hàng của bảng Mặt hàng.,
+POS Register,Đăng ký POS,
+"Can not filter based on POS Profile, if grouped by POS Profile","Không thể lọc dựa trên Hồ sơ POS, nếu được nhóm theo Hồ sơ POS",
+"Can not filter based on Customer, if grouped by Customer","Không thể lọc dựa trên Khách hàng, nếu được nhóm theo Khách hàng",
+"Can not filter based on Cashier, if grouped by Cashier","Không thể lọc dựa trên Thu ngân, nếu được nhóm theo Thu ngân",
+Payment Method,Phương thức thanh toán,
+"Can not filter based on Payment Method, if grouped by Payment Method","Không thể lọc dựa trên Phương thức thanh toán, nếu được nhóm theo Phương thức thanh toán",
+Supplier Quotation Comparison,So sánh báo giá của nhà cung cấp,
+Price per Unit (Stock UOM),Giá mỗi đơn vị (Stock UOM),
+Group by Supplier,Nhóm theo nhà cung cấp,
+Group by Item,Nhóm theo mặt hàng,
+Remember to set {field_label}. It is required by {regulation}.,Nhớ đặt {field_label}. Nó được yêu cầu bởi {quy định}.,
+Enrollment Date cannot be before the Start Date of the Academic Year {0},Ngày ghi danh không được trước Ngày bắt đầu của Năm học {0},
+Enrollment Date cannot be after the End Date of the Academic Term {0},Ngày ghi danh không được sau Ngày kết thúc Học kỳ {0},
+Enrollment Date cannot be before the Start Date of the Academic Term {0},Ngày ghi danh không được trước Ngày bắt đầu của Học kỳ {0},
+Posting future transactions are not allowed due to Immutable Ledger,Không cho phép đăng các giao dịch trong tương lai do Sổ cái bất biến,
+Future Posting Not Allowed,Đăng trong tương lai không được phép,
+"To enable Capital Work in Progress Accounting, ","Để kích hoạt Công việc Vốn trong Kế toán Tiến độ,",
+you must select Capital Work in Progress Account in accounts table,bạn phải chọn Tài khoản Capital Work in Progress trong bảng tài khoản,
+You can also set default CWIP account in Company {},Bạn cũng có thể đặt tài khoản CWIP mặc định trong Công ty {},
+The Request for Quotation can be accessed by clicking on the following button,Yêu cầu Báo giá có thể được truy cập bằng cách nhấp vào nút sau,
+Regards,Trân trọng,
+Please click on the following button to set your new password,Vui lòng nhấp vào nút sau để đặt mật khẩu mới của bạn,
+Update Password,Cập nhật mật khẩu,
+Row #{}: Selling rate for item {} is lower than its {}. Selling {} should be atleast {},Hàng # {}: Tỷ lệ bán được của mặt hàng {} thấp hơn mặt hàng {}. Bán {} ít nên {},
+You can alternatively disable selling price validation in {} to bypass this validation.,"Ngoài ra, bạn có thể tắt xác thực giá bán trong {} để bỏ qua xác thực này.",
+Invalid Selling Price,Giá bán không hợp lệ,
+Address needs to be linked to a Company. Please add a row for Company in the Links table.,Địa chỉ cần được liên kết với một Công ty. Vui lòng thêm một hàng cho Công ty trong bảng Liên kết.,
+Company Not Linked,Công ty không được liên kết,
+Import Chart of Accounts from CSV / Excel files,Nhập biểu đồ tài khoản từ tệp CSV / Excel,
+Completed Qty cannot be greater than 'Qty to Manufacture',Số lượng đã hoàn thành không được lớn hơn &#39;Số lượng để sản xuất&#39;,
+"Row {0}: For Supplier {1}, Email Address is Required to send an email","Hàng {0}: Đối với Nhà cung cấp {1}, Địa chỉ Email là Bắt buộc để gửi email",
diff --git a/erpnext/translations/zh.csv b/erpnext/translations/zh.csv
index 4f455ee..3bd4e8a 100644
--- a/erpnext/translations/zh.csv
+++ b/erpnext/translations/zh.csv
@@ -521,7 +521,6 @@
 Chargeble,Chargeble,
 Charges are updated in Purchase Receipt against each item,费用会在每个物料的采购收货单中更新,
 "Charges will be distributed proportionately based on item qty or amount, as per your selection",费用会根据你选择的物料数量和金额按比例分配。,
-Chart Of Accounts,科目表,
 Chart of Cost Centers,成本中心表,
 Check all,全选,
 Checkout,退出,
@@ -581,7 +580,6 @@
 Compensatory Off,补假,
 Compensatory leave request days not in valid holidays,补休假申请日不是在有效假期内,
 Complaint,抱怨,
-Completed Qty can not be greater than 'Qty to Manufacture',完成数量不能大于“生产数量”,
 Completion Date,完成日期,
 Computer,电脑,
 Condition,条件,
@@ -2033,7 +2031,6 @@
 Please select Charge Type first,请先选择费用类型,
 Please select Company,请选择公司,
 Please select Company and Designation,请选择公司和任命,
-Please select Company and Party Type first,请先选择公司和往来单位类型,
 Please select Company and Posting Date to getting entries,请选择公司和发布日期以获取条目,
 Please select Company first,请首先选择公司,
 Please select Completion Date for Completed Asset Maintenance Log,请选择已完成资产维护日志的完成日期,
@@ -2980,7 +2977,6 @@
 The name of your company for which you are setting up this system.,贵公司的名称,
 The number of shares and the share numbers are inconsistent,股份数量和股票数量不一致,
 The payment gateway account in plan {0} is different from the payment gateway account in this payment request,计划{0}中的支付网关帐户与此付款请求中的支付网关帐户不同,
-The request for quotation can be accessed by clicking on the following link,报价请求可以通过点击以下链接进行访问,
 The selected BOMs are not for the same item,所选物料清单不能用于同一个物料,
 The selected item cannot have Batch,所选物料不能有批次,
 The seller and the buyer cannot be the same,卖方和买方不能相同,
@@ -3130,7 +3126,6 @@
 Total flexible benefit component amount {0} should not be less than max benefits {1},总灵活福利金额{0}不应低于最高福利金额{1},
 Total hours: {0},总时间：{0},
 Total leaves allocated is mandatory for Leave Type {0},请填写休假类型{0}的总已分配休假天数,
-Total weightage assigned should be 100%. It is {0},分配的总权重应为100 ％ 。这是{0},
 Total working hours should not be greater than max working hours {0},总的工作时间不应超过最高工时更大{0},
 Total {0} ({1}),总{0}（{1}）,
 "Total {0} for all items is zero, may be you should change 'Distribute Charges Based On'",所有项目合计{0}为零，可能你应该改变“基于分布式费用”,
@@ -3544,7 +3539,6 @@
 Company field is required,公司字段是必填项,
 Creating Dimensions...,创建尺寸......,
 Duplicate entry against the item code {0} and manufacturer {1},项目代码{0}和制造商{1}的重复输入,
-Import Chart Of Accounts from CSV / Excel files,从CSV / Excel文件导入科目表,
 Invalid GSTIN! The input you've entered doesn't match the GSTIN format for UIN Holders or Non-Resident OIDAR Service Providers,GSTIN无效！您输入的输入与UIN持有人或非居民OIDAR服务提供商的GSTIN格式不符,
 Invoice Grand Total,发票总计,
 Last carbon check date cannot be a future date,最后的碳检查日期不能是未来的日期,
@@ -3921,7 +3915,6 @@
 Plaid public token error,格子公共令牌错误,
 Plaid transactions sync error,格子交易同步错误,
 Please check the error log for details about the import errors,有关导入错误的详细信息，请查看错误日志,
-Please click on the following link to set your new password,请点击以下链接来设置新密码,
 Please create <b>DATEV Settings</b> for Company <b>{}</b>.,请为公司<b>{}</b>创建<b>DATEV设置</b> 。,
 Please create adjustment Journal Entry for amount {0} ,请为金额{0}创建调整日记帐分录,
 Please do not create more than 500 items at a time,请不要一次创建超过500个项目,
@@ -3997,6 +3990,7 @@
 Release date must be in the future,发布日期必须在将来,
 Relieving Date must be greater than or equal to Date of Joining,取消日期必须大于或等于加入日期,
 Rename,重命名,
+Rename Not Allowed,重命名不允许,
 Repayment Method is mandatory for term loans,定期贷款必须采用还款方法,
 Repayment Start Date is mandatory for term loans,定期贷款的还款开始日期是必填项,
 Report Item,报告项目,
@@ -4043,7 +4037,6 @@
 Select All,全选,
 Select Difference Account,选择差异账户,
 Select a Default Priority.,选择默认优先级。,
-Select a Supplier from the Default Supplier List of the items below.,从以下各项的默认供应商列表中选择供应商。,
 Select a company,选择一家公司,
 Select finance book for the item {0} at row {1},为行{1}中的项{0}选择财务手册,
 Select only one Priority as Default.,仅选择一个优先级作为默认值。,
@@ -4247,7 +4240,6 @@
 Actual ,实际数据,
 Add to cart,加入购物车,
 Budget,预算,
-Chart Of Accounts Importer,会计科目表进口商,
 Chart of Accounts,会计科目表,
 Customer database.,客户数据库。,
 Days Since Last order,自上次订购天数,
@@ -4546,7 +4538,6 @@
 Check Supplier Invoice Number Uniqueness,检查供应商费用清单编号唯一性,
 Make Payment via Journal Entry,通过手工凭证进行付款,
 Unlink Payment on Cancellation of Invoice,取消费用清单时去掉关联的付款,
-Unlink Advance Payment on Cancelation of Order,取消订单取消预付款,
 Book Asset Depreciation Entry Automatically,自动生成固定资产折旧凭证,
 Automatically Add Taxes and Charges from Item Tax Template,从项目税模板自动添加税费,
 Automatically Fetch Payment Terms,自动获取付款条款,
@@ -4940,7 +4931,6 @@
 POS Customer Group,销售终端客户群,
 POS Field,POS场,
 POS Item Group,销售终端物料组,
-[Select],[选择],
 Company Address,公司地址,
 Update Stock,更新库存,
 Ignore Pricing Rule,忽略定价规则,
@@ -6481,7 +6471,6 @@
 Appraisal Template,评估模板,
 For Employee Name,员工姓名,
 Goals,绩效指标,
-Calculate Total Score,计算总分,
 Total Score (Out of 5),总分（满分5分）,
 "Any other remarks, noteworthy effort that should go in the records.",任何其他注释，值得一提的努力，应该记录下来。,
 Appraisal Goal,绩效评估指标,
@@ -6599,11 +6588,6 @@
 Reason for Leaving,离职原因,
 Leave Encashed?,假期已折现？,
 Encashment Date,折现日期,
-Exit Interview Details,离职访谈信息,
-Held On,日期,
-Reason for Resignation,离职原因,
-Better Prospects,更好的前景,
-Health Concerns,健康问题,
 New Workplace,新工作地点,
 HR-EAD-.YYYY.-,HR-EAD-.YYYY.-,
 Returned Amount,退货金额,
@@ -8239,9 +8223,6 @@
 Manufacturers used in Items,在项目中使用制造商,
 Limited to 12 characters,限12个字符,
 MAT-MR-.YYYY.-,MAT-MR-.YYYY.-,
-Set Warehouse,设置仓库,
-Sets 'For Warehouse' in each row of the Items table.,在“物料”表的每一行中设置“用于仓库”。,
-Requested For,需求目的,
 Partially Ordered,部分订购,
 Transferred,已转移,
 % Ordered,%  已排序,
@@ -8690,8 +8671,6 @@
 Select warehouse for material requests,选择物料需求仓库,
 Transfer Materials For Warehouse {0},仓库{0}的转移物料,
 Production Plan Material Request Warehouse,生产计划物料申请仓库,
-Set From Warehouse,从仓库设置,
-Source Warehouse (Material Transfer),源仓库（物料转移）,
 Sets 'Source Warehouse' in each row of the items table.,在项目表的每一行中设置“源仓库”。,
 Sets 'Target Warehouse' in each row of the items table.,在项目表的每一行中设置“目标仓库”。,
 Show Cancelled Entries,显示已取消的条目,
@@ -9157,7 +9136,6 @@
 Is Income Tax Component,是所得税组成部分,
 Component properties and references ,组件属性和参考,
 Additional Salary ,额外工资,
-Condtion and formula,条件和公式,
 Unmarked days,无标记的日子,
 Absent Days,缺席天数,
 Conditions and Formula variable and example,条件和公式变量以及示例,
@@ -9444,7 +9422,6 @@
 Please check your Plaid client ID and secret values,请检查您的格子客户ID和机密值,
 Bank transaction creation error,银行交易创建错误,
 Unit of Measurement,测量单位,
-Row #{}: Selling rate for item {} is lower than its {}. Selling rate should be atleast {},第＃{}行：商品{}的销售价格低于其{}。销售率应至少为{},
 Fiscal Year {0} Does Not Exist,会计年度{0}不存在,
 Row # {0}: Returned Item {1} does not exist in {2} {3},行号{0}：返回的项目{1}在{2} {3}中不存在,
 Valuation type charges can not be marked as Inclusive,评估类型的费用不能标记为包含,
@@ -9598,8 +9575,60 @@
 Response Time for {0} priority in row {1} can't be greater than Resolution Time.,第{1}行中{0}优先级的响应时间不能大于“解决时间”。,
 {0} is not enabled in {1},{1}中未启用{0},
 Group by Material Request,按材料要求分组,
-"Row {0}: For Supplier {0}, Email Address is Required to Send Email",第{0}行：对于供应商{0}，需要使用电子邮件地址发送电子邮件,
 Email Sent to Supplier {0},通过电子邮件发送给供应商{0},
 "The Access to Request for Quotation From Portal is Disabled. To Allow Access, Enable it in Portal Settings.",禁止从门户网站访问报价请求。要允许访问，请在门户设置中启用它。,
 Supplier Quotation {0} Created,供应商报价{0}已创建,
 Valid till Date cannot be before Transaction Date,有效期至日期不能早于交易日期,
+Unlink Advance Payment on Cancellation of Order,取消订单时取消预付款链接,
+"Simple Python Expression, Example: territory != 'All Territories'",简单的Python表达式，例如：region！=&#39;All Territories&#39;,
+Sales Contributions and Incentives,销售贡献和激励,
+Sourced by Supplier,由供应商采购,
+Total weightage assigned should be 100%.<br>It is {0},分配的总重量应为100％。<br>是{0},
+Account {0} exists in parent company {1}.,帐户{0}在母公司{1}中。,
+"To overrule this, enable '{0}' in company {1}",要否决此问题，请在公司{1}中启用“ {0}”,
+Invalid condition expression,条件表达式无效,
+Please Select a Company First,请先选择公司,
+Please Select Both Company and Party Type First,请首先选择公司和派对类型,
+Provide the invoice portion in percent,提供发票百分比,
+Give number of days according to prior selection,根据事先选择给出天数,
+Email Details,电子邮件详细资料,
+"Select a greeting for the receiver. E.g. Mr., Ms., etc.",选择收件人的问候语。例如先生，女士等,
+Preview Email,预览电子邮件,
+Please select a Supplier,请选择供应商,
+Supplier Lead Time (days),供应商交货时间（天）,
+"Home, Work, etc.",家庭，工作等,
+Exit Interview Held On,退出面试举行,
+Condition and formula,条件和公式,
+Sets 'Target Warehouse' in each row of the Items table.,在“物料”表的每一行中设置“目标仓库”。,
+Sets 'Source Warehouse' in each row of the Items table.,在“物料”表的每一行中设置“源仓库”。,
+POS Register,POS收银机,
+"Can not filter based on POS Profile, if grouped by POS Profile",如果按POS配置文件分组，则无法基于POS配置文件进行过滤,
+"Can not filter based on Customer, if grouped by Customer",如果按客户分组，则无法根据客户进行过滤,
+"Can not filter based on Cashier, if grouped by Cashier",如果按收银员分组，则无法根据收银员进行过滤,
+Payment Method,付款方法,
+"Can not filter based on Payment Method, if grouped by Payment Method",如果按付款方式分组，则无法基于付款方式进行过滤,
+Supplier Quotation Comparison,供应商报价比较,
+Price per Unit (Stock UOM),单价（库存单位）,
+Group by Supplier,按供应商分组,
+Group by Item,按项目分组,
+Remember to set {field_label}. It is required by {regulation}.,请记住设置{field_label}。 {regulation}要求它。,
+Enrollment Date cannot be before the Start Date of the Academic Year {0},入学日期不能早于学年的开始日期{0},
+Enrollment Date cannot be after the End Date of the Academic Term {0},入学日期不能晚于学期结束日期{0},
+Enrollment Date cannot be before the Start Date of the Academic Term {0},入学日期不能早于学期开始日期{0},
+Posting future transactions are not allowed due to Immutable Ledger,由于帐目不可变，因此不允许过帐未来交易,
+Future Posting Not Allowed,不允许将来发布,
+"To enable Capital Work in Progress Accounting, ",要启用基本工程进度会计，,
+you must select Capital Work in Progress Account in accounts table,您必须在帐户表中选择正在进行的资本工程帐户,
+You can also set default CWIP account in Company {},您还可以在公司{}中设置默认的CWIP帐户,
+The Request for Quotation can be accessed by clicking on the following button,点击以下按钮可以访问报价请求,
+Regards,问候,
+Please click on the following button to set your new password,请点击以下按钮设置新密码,
+Update Password,更新密码,
+Row #{}: Selling rate for item {} is lower than its {}. Selling {} should be atleast {},第＃{}行：商品{}的销售价格低于其{}。出售{}应该至少{},
+You can alternatively disable selling price validation in {} to bypass this validation.,您也可以在{}中禁用售价验证，以绕过此验证。,
+Invalid Selling Price,无效的售价,
+Address needs to be linked to a Company. Please add a row for Company in the Links table.,地址需要链接到公司。请在“链接”表中为“公司”添加一行。,
+Company Not Linked,公司未链接,
+Import Chart of Accounts from CSV / Excel files,从CSV / Excel文件导入会计科目表,
+Completed Qty cannot be greater than 'Qty to Manufacture',完成的数量不能大于“制造数量”,
+"Row {0}: For Supplier {1}, Email Address is Required to send an email",第{0}行：对于供应商{1}，需要电子邮件地址才能发送电子邮件,
diff --git a/erpnext/translations/zh_tw.csv b/erpnext/translations/zh_tw.csv
index e2e9ed9..8cfba78 100644
--- a/erpnext/translations/zh_tw.csv
+++ b/erpnext/translations/zh_tw.csv
@@ -484,7 +484,6 @@
 Charge of type 'Actual' in row {0} cannot be included in Item Rate,類型'實際'行{0}的計費，不能被包含在項目單價,
 Charges are updated in Purchase Receipt against each item,費用對在採購入庫單內的每個項目更新,
 "Charges will be distributed proportionately based on item qty or amount, as per your selection",費用將被分配比例根據項目數量或金額，按您的選擇,
-Chart Of Accounts,會計科目表,
 Chart of Cost Centers,成本中心的圖,
 Check all,全面檢查,
 Checkout,查看,
@@ -539,7 +538,6 @@
 Company name not same,公司名稱不一樣,
 Compensatory Off,補假,
 Compensatory leave request days not in valid holidays,補休請求天不在有效假期,
-Completed Qty can not be greater than 'Qty to Manufacture',完成數量不能大於“數量來製造”,
 Computer,電腦,
 Condition,條件,
 Confirmed orders from Customers.,確認客戶的訂單。,
@@ -1894,7 +1892,6 @@
 Please select Charge Type first,請先選擇付款類別,
 Please select Company,請選擇公司,
 Please select Company and Designation,請選擇公司和指定,
-Please select Company and Party Type first,請選擇公司和黨的第一型,
 Please select Company and Posting Date to getting entries,請選擇公司和發布日期以獲取條目,
 Please select Company first,請首先選擇公司,
 Please select Completion Date for Completed Asset Maintenance Log,請選擇已完成資產維護日誌的完成日期,
@@ -2795,7 +2792,6 @@
 The name of your company for which you are setting up this system.,您的公司要為其設立這個系統的名稱。,
 The number of shares and the share numbers are inconsistent,股份數量和股票數量不一致,
 The payment gateway account in plan {0} is different from the payment gateway account in this payment request,計劃{0}中的支付網關帳戶與此付款請求中的支付網關帳戶不同,
-The request for quotation can be accessed by clicking on the following link,報價請求可以通過點擊以下鏈接進行訪問,
 The selected BOMs are not for the same item,所選的材料清單並不同樣項目,
 The selected item cannot have Batch,所選項目不能批,
 The seller and the buyer cannot be the same,賣方和買方不能相同,
@@ -2938,7 +2934,6 @@
 Total flexible benefit component amount {0} should not be less than max benefits {1},總靈活福利金額{0}不應低於最高福利金額{1},
 Total hours: {0},總時間：{0},
 Total leaves allocated is mandatory for Leave Type {0},為假期類型{0}分配的總分配數是強制性的,
-Total weightage assigned should be 100%. It is {0},分配的總權重應為100 ％ 。這是{0},
 Total working hours should not be greater than max working hours {0},總的工作時間不應超過最高工時更大{0},
 Total {0} ({1}),總{0}（{1}）,
 "Total {0} for all items is zero, may be you should change 'Distribute Charges Based On'",共有{0}所有項目為零，可能是你應該“基於分佈式費用”改變,
@@ -3318,7 +3313,6 @@
 Company field is required,公司字段是必填項,
 Creating Dimensions...,創建尺寸......,
 Duplicate entry against the item code {0} and manufacturer {1},項目代碼{0}和製造商{1}的重複輸入,
-Import Chart Of Accounts from CSV / Excel files,從CSV / Excel文件導入科目表,
 Invalid GSTIN! The input you've entered doesn't match the GSTIN format for UIN Holders or Non-Resident OIDAR Service Providers,GSTIN無效！您輸入的輸入與UIN持有人或非居民OIDAR服務提供商的GSTIN格式不符,
 Invoice Grand Total,發票總計,
 Last carbon check date cannot be a future date,最後的碳檢查日期不能是未來的日期,
@@ -3674,7 +3668,6 @@
 Plaid public token error,格子公共令牌錯誤,
 Plaid transactions sync error,格子交易同步錯誤,
 Please check the error log for details about the import errors,有關導入錯誤的詳細信息，請查看錯誤日誌,
-Please click on the following link to set your new password,請點擊以下鏈接來設置新密碼,
 Please create <b>DATEV Settings</b> for Company <b>{}</b>.,請為公司<b>{}</b>創建<b>DATEV設置</b> 。,
 Please create adjustment Journal Entry for amount {0} ,請為金額{0}創建調整日記帳分錄,
 Please do not create more than 500 items at a time,請不要一次創建超過500個項目,
@@ -3748,6 +3741,7 @@
 Release date must be in the future,發布日期必須在將來,
 Relieving Date must be greater than or equal to Date of Joining,取消日期必須大於或等於加入日期,
 Rename,改名,
+Rename Not Allowed,重命名不允許,
 Repayment Method is mandatory for term loans,定期貸款必須採用還款方法,
 Repayment Start Date is mandatory for term loans,定期貸款的還款開始日期是必填項,
 Report Item,報告項目,
@@ -3791,7 +3785,6 @@
 Select All,全選,
 Select Difference Account,選擇差異賬戶,
 Select a Default Priority.,選擇默認優先級。,
-Select a Supplier from the Default Supplier List of the items below.,從以下各項的默認供應商列表中選擇供應商。,
 Select a company,選擇一家公司,
 Select finance book for the item {0} at row {1},為行{1}中的項{0}選擇財務手冊,
 Select only one Priority as Default.,僅選擇一個優先級作為默認值。,
@@ -3977,7 +3970,6 @@
 Actual ,實際,
 Add to cart,添加到購物車,
 Budget,預算,
-Chart Of Accounts Importer,會計科目表進口商,
 Chart of Accounts,會計科目表,
 Customer database.,客戶數據庫。,
 Days Since Last order,自上次訂購以來的天數,
@@ -4257,7 +4249,6 @@
 Check Supplier Invoice Number Uniqueness,檢查供應商發票編號唯一性,
 Make Payment via Journal Entry,通過日記帳分錄進行付款,
 Unlink Payment on Cancellation of Invoice,取消鏈接在發票上的取消付款,
-Unlink Advance Payment on Cancelation of Order,取消訂單取消預付款,
 Book Asset Depreciation Entry Automatically,自動存入資產折舊條目,
 Automatically Add Taxes and Charges from Item Tax Template,從項目稅模板自動添加稅費,
 Automatically Fetch Payment Terms,自動獲取付款條款,
@@ -4626,7 +4617,6 @@
 POS Customer Group,POS客戶群,
 POS Field,POS場,
 POS Item Group,POS項目組,
-[Select],[選擇],
 Update Stock,庫存更新,
 Ignore Pricing Rule,忽略定價規則,
 Applicable for Users,適用於用戶,
@@ -6032,7 +6022,6 @@
 Appraisal Template,評估模板,
 For Employee Name,對於員工姓名,
 Goals,目標,
-Calculate Total Score,計算總分,
 Total Score (Out of 5),總分（滿分5分）,
 "Any other remarks, noteworthy effort that should go in the records.",任何其他言論，值得一提的努力，應該在記錄中。,
 Appraisal Goal,考核目標,
@@ -6138,11 +6127,6 @@
 Reason for Leaving,離職原因,
 Leave Encashed?,離開兌現？,
 Encashment Date,兌現日期,
-Exit Interview Details,退出面試細節,
-Held On,舉行,
-Reason for Resignation,辭退原因,
-Better Prospects,美好前景,
-Health Concerns,健康問題,
 New Workplace,新工作空間,
 Returned Amount,退貨金額,
 Claimed,聲稱,
@@ -7679,9 +7663,6 @@
 Landed Cost Help,到岸成本幫助,
 Manufacturers used in Items,在項目中使用製造商,
 Limited to 12 characters,限12個字符,
-Set Warehouse,設置倉庫,
-Sets 'For Warehouse' in each row of the Items table.,在“物料”表的每一行中設置“用於倉庫”。,
-Requested For,要求,
 Partially Ordered,部分訂購,
 Transferred,轉入,
 % Ordered,% 已訂購,
@@ -8109,8 +8090,6 @@
 Select warehouse for material requests,選擇物料需求倉庫,
 Transfer Materials For Warehouse {0},倉庫{0}的轉移物料,
 Production Plan Material Request Warehouse,生產計劃物料申請倉庫,
-Set From Warehouse,從倉庫設置,
-Source Warehouse (Material Transfer),源倉庫（物料轉移）,
 Sets 'Source Warehouse' in each row of the items table.,在項目表的每一行中設置“源倉庫”。,
 Sets 'Target Warehouse' in each row of the items table.,在項目表的每一行中設置“目標倉庫”。,
 Show Cancelled Entries,顯示已取消的條目,
@@ -8506,7 +8485,6 @@
 Is Income Tax Component,是所得稅組成部分,
 Component properties and references ,組件屬性和參考,
 Additional Salary ,額外工資,
-Condtion and formula,條件和公式,
 Unmarked days,無標記的日子,
 Absent Days,缺席天數,
 Conditions and Formula variable and example,條件和公式變量以及示例,
@@ -8766,7 +8744,6 @@
 Please check your Plaid client ID and secret values,請檢查您的格子客戶ID和機密值,
 Bank transaction creation error,銀行交易創建錯誤,
 Unit of Measurement,測量單位,
-Row #{}: Selling rate for item {} is lower than its {}. Selling rate should be atleast {},第＃{}行：商品{}的銷售價格低於其{}。銷售率應至少為{},
 Fiscal Year {0} Does Not Exist,會計年度{0}不存在,
 Row # {0}: Returned Item {1} does not exist in {2} {3},第＃0行：{2} {3}中不存在返回的項目{1},
 Valuation type charges can not be marked as Inclusive,評估類型的費用不能標記為包含,
@@ -8917,8 +8894,58 @@
 Response Time for {0} priority in row {1} can't be greater than Resolution Time.,第{1}行中{0}優先級的響應時間不能大於“解決時間”。,
 {0} is not enabled in {1},{1}中未啟用{0},
 Group by Material Request,按材料要求分組,
-"Row {0}: For Supplier {0}, Email Address is Required to Send Email",第{0}行：對於供應商{0}，需要使用電子郵件地址發送電子郵件,
 Email Sent to Supplier {0},通過電子郵件發送給供應商{0},
 "The Access to Request for Quotation From Portal is Disabled. To Allow Access, Enable it in Portal Settings.",禁止從門戶網站訪問報價請求。要允許訪問，請在門戶設置中啟用它。,
 Supplier Quotation {0} Created,供應商報價{0}已創建,
 Valid till Date cannot be before Transaction Date,有效期至日期不能早於交易日期,
+Unlink Advance Payment on Cancellation of Order,取消訂單時取消預付款鏈接,
+"Simple Python Expression, Example: territory != 'All Territories'",簡單的Python表達式，例如：region！=&#39;All Territories&#39;,
+Sales Contributions and Incentives,銷售貢獻和激勵,
+Sourced by Supplier,由供應商採購,
+Total weightage assigned should be 100%.<br>It is {0},分配的總重量應為100％。<br>是{0},
+Account {0} exists in parent company {1}.,帳戶{0}在母公司{1}中。,
+"To overrule this, enable '{0}' in company {1}",要否決此問題，請在公司{1}中啟用“ {0}”,
+Invalid condition expression,條件表達式無效,
+Please Select a Company First,請先選擇公司,
+Please Select Both Company and Party Type First,請首先選擇公司和派對類型,
+Provide the invoice portion in percent,提供發票百分比,
+Give number of days according to prior selection,根據事先選擇給出天數,
+Email Details,電子郵件詳細資料,
+"Select a greeting for the receiver. E.g. Mr., Ms., etc.",選擇收件人的問候語。例如先生，女士等,
+Preview Email,預覽電子郵件,
+Please select a Supplier,請選擇供應商,
+Supplier Lead Time (days),供應商交貨時間（天）,
+Exit Interview Held On,退出面試舉行,
+Condition and formula,條件和公式,
+Sets 'Target Warehouse' in each row of the Items table.,在“物料”表的每一行中設置“目標倉庫”。,
+Sets 'Source Warehouse' in each row of the Items table.,在“物料”表的每一行中設置“源倉庫”。,
+POS Register,POS收銀機,
+"Can not filter based on POS Profile, if grouped by POS Profile",如果按POS配置文件分組，則無法基於POS配置文件進行過濾,
+"Can not filter based on Customer, if grouped by Customer",如果按客戶分組，則無法根據客戶進行過濾,
+"Can not filter based on Cashier, if grouped by Cashier",如果按收銀員分組，則無法根據收銀員進行過濾,
+"Can not filter based on Payment Method, if grouped by Payment Method",如果按付款方式分組，則無法基於付款方式進行過濾,
+Supplier Quotation Comparison,供應商報價比較,
+Price per Unit (Stock UOM),單價（庫存單位）,
+Group by Supplier,按供應商分組,
+Group by Item,按項目分組,
+Remember to set {field_label}. It is required by {regulation}.,請記住設置{field_label}。 {regulation}要求它。,
+Enrollment Date cannot be before the Start Date of the Academic Year {0},入學日期不能早於學年的開始日期{0},
+Enrollment Date cannot be after the End Date of the Academic Term {0},入學日期不能晚於學期結束日期{0},
+Enrollment Date cannot be before the Start Date of the Academic Term {0},入學日期不能早於學期開始日期{0},
+Posting future transactions are not allowed due to Immutable Ledger,由於帳目不可變，因此不允許過帳未來交易,
+Future Posting Not Allowed,不允許將來發布,
+"To enable Capital Work in Progress Accounting, ",要啟用基本工程進度會計，,
+you must select Capital Work in Progress Account in accounts table,您必須在帳戶表中選擇正在進行的資本工程帳戶,
+You can also set default CWIP account in Company {},您還可以在公司{}中設置默認的CWIP帳戶,
+The Request for Quotation can be accessed by clicking on the following button,點擊以下按鈕可以訪問報價請求,
+Regards,問候,
+Please click on the following button to set your new password,請點擊以下按鈕設置新密碼,
+Update Password,更新密碼,
+Row #{}: Selling rate for item {} is lower than its {}. Selling {} should be atleast {},第＃{}行：商品{}的銷售價格低於其{}。出售{}應該至少{},
+You can alternatively disable selling price validation in {} to bypass this validation.,您也可以在{}中禁用售價驗證，以繞過此驗證。,
+Invalid Selling Price,無效的售價,
+Address needs to be linked to a Company. Please add a row for Company in the Links table.,地址需要鏈接到公司。請在“鏈接”表中為“公司”添加一行。,
+Company Not Linked,公司未鏈接,
+Import Chart of Accounts from CSV / Excel files,從CSV / Excel文件導入會計科目表,
+Completed Qty cannot be greater than 'Qty to Manufacture',完成的數量不能大於“製造數量”,
+"Row {0}: For Supplier {1}, Email Address is Required to send an email",第{0}行：對於供應商{1}，需要電子郵件地址才能發送電子郵件,
diff --git a/erpnext/utilities/transaction_base.py b/erpnext/utilities/transaction_base.py
index 298e111..c8ae733 100644
--- a/erpnext/utilities/transaction_base.py
+++ b/erpnext/utilities/transaction_base.py
@@ -29,28 +29,6 @@
 			except ValueError:
 				frappe.throw(_('Invalid Posting Time'))
 
-		self.validate_future_posting()
-		self.validate_with_last_transaction_posting_time()
-	
-	def is_stock_transaction(self):
-		if self.doctype not in ["Sales Invoice", "Purchase Invoice", "Stock Entry", "Stock Reconciliation",
-			"Delivery Note", "Purchase Receipt", "Fees"]:
-				return False
-
-		if self.doctype in ["Sales Invoice", "Purchase Invoice"]:
-			if not (self.get("update_stock") or self.get("is_pos")):
-				return False
-
-		return True
-	
-	def validate_future_posting(self):
-		if not self.is_stock_transaction():
-			return
-
-		if getattr(self, 'set_posting_time', None) and date_diff(self.posting_date, nowdate()) > 0:
-			msg = _("Posting future transactions are not allowed due to Immutable Ledger")
-			frappe.throw(msg, title=_("Future Posting Not Allowed"))
-
 	def add_calendar_event(self, opts, force=False):
 		if cstr(self.contact_by) != cstr(self._prev.contact_by) or \
 				cstr(self.contact_date) != cstr(self._prev.contact_date) or force or \
@@ -180,25 +158,6 @@
 
 		return ret
 
-	def validate_with_last_transaction_posting_time(self):
-
-		if not self.is_stock_transaction():
-			return
-
-		for item in self.get('items'):
-			last_transaction_time = frappe.db.sql("""
-				select MAX(timestamp(posting_date, posting_time)) as posting_time
-				from `tabStock Ledger Entry`
-				where docstatus = 1 and item_code = %s """, (item.item_code))[0][0]
-
-			cur_doc_posting_datetime = "%s %s" % (self.posting_date, self.get("posting_time") or "00:00:00")
-
-			if last_transaction_time and get_datetime(cur_doc_posting_datetime) < get_datetime(last_transaction_time):
-				msg = _("Last Stock Transaction for item {0} was on {1}.").format(frappe.bold(item.item_code), frappe.bold(last_transaction_time))
-				msg += "<br><br>" + _("Stock Transactions for Item {0} cannot be posted before this time.").format(frappe.bold(item.item_code))
-				msg += "<br><br>" + _("Please remove this item and try to submit again or update the posting time.")
-				frappe.throw(msg, title=_("Backdated Stock Entry"))
-
 def delete_events(ref_type, ref_name):
 	events = frappe.db.sql_list(""" SELECT
 			distinct `tabEvent`.name