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/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/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/loyalty_program/test_loyalty_program.py b/erpnext/accounts/doctype/loyalty_program/test_loyalty_program.py
index ee73cca..5278d8b 100644
--- a/erpnext/accounts/doctype/loyalty_program/test_loyalty_program.py
+++ b/erpnext/accounts/doctype/loyalty_program/test_loyalty_program.py
@@ -195,88 +195,91 @@
 
 def create_records():
 	# create a new loyalty Account
-	if frappe.db.exists("Account", "Loyalty - _TC"):
-		return
-
-	frappe.get_doc({
-		"doctype": "Account",
-		"account_name": "Loyalty",
-		"parent_account": "Direct Expenses - _TC",
-		"company": "_Test Company",
-		"is_group": 0,
-		"account_type": "Expense Account",
-	}).insert()
+	if not frappe.db.exists("Account", "Loyalty - _TC"):
+		frappe.get_doc({
+			"doctype": "Account",
+			"account_name": "Loyalty",
+			"parent_account": "Direct Expenses - _TC",
+			"company": "_Test Company",
+			"is_group": 0,
+			"account_type": "Expense Account",
+		}).insert()
 
 	# create a new loyalty program Single tier
-	frappe.get_doc({
-		"doctype": "Loyalty Program",
-		"loyalty_program_name": "Test Single Loyalty",
-		"auto_opt_in": 1,
-		"from_date": today(),
-		"loyalty_program_type": "Single Tier Program",
-		"conversion_factor": 1,
-		"expiry_duration": 10,
-		"company": "_Test Company",
-		"cost_center": "Main - _TC",
-		"expense_account": "Loyalty - _TC",
-		"collection_rules": [{
-			'tier_name': 'Silver',
-			'collection_factor': 1000,
-			'min_spent': 1000
-		}]
-	}).insert()
-
-	# create a new customer
-	frappe.get_doc({
-		"customer_group": "_Test Customer Group",
-		"customer_name": "Test Loyalty Customer",
-		"customer_type": "Individual",
-		"doctype": "Customer",
-		"territory": "_Test Territory"
-	}).insert()
-
-	# create a new loyalty program Multiple tier
-	frappe.get_doc({
-		"doctype": "Loyalty Program",
-		"loyalty_program_name": "Test Multiple Loyalty",
-		"auto_opt_in": 1,
-		"from_date": today(),
-		"loyalty_program_type": "Multiple Tier Program",
-		"conversion_factor": 1,
-		"expiry_duration": 10,
-		"company": "_Test Company",
-		"cost_center": "Main - _TC",
-		"expense_account": "Loyalty - _TC",
-		"collection_rules": [
-			{
+	if not frappe.db.exists("Loyalty Program","Test Single Loyalty"):
+		frappe.get_doc({
+			"doctype": "Loyalty Program",
+			"loyalty_program_name": "Test Single Loyalty",
+			"auto_opt_in": 1,
+			"from_date": today(),
+			"loyalty_program_type": "Single Tier Program",
+			"conversion_factor": 1,
+			"expiry_duration": 10,
+			"company": "_Test Company",
+			"cost_center": "Main - _TC",
+			"expense_account": "Loyalty - _TC",
+			"collection_rules": [{
 				'tier_name': 'Silver',
 				'collection_factor': 1000,
-				'min_spent': 10000
-			},
-			{
-				'tier_name': 'Gold',
-				'collection_factor': 1000,
-				'min_spent': 19000
-			}
-		]
-	}).insert()
+				'min_spent': 1000
+			}]
+		}).insert()
+
+	# create a new customer
+	if not frappe.db.exists("Customer","Test Loyalty Customer"):
+		frappe.get_doc({
+			"customer_group": "_Test Customer Group",
+			"customer_name": "Test Loyalty Customer",
+			"customer_type": "Individual",
+			"doctype": "Customer",
+			"territory": "_Test Territory"
+		}).insert()
+
+	# create a new loyalty program Multiple tier
+	if not frappe.db.exists("Loyalty Program","Test Multiple Loyalty"):
+		frappe.get_doc({
+			"doctype": "Loyalty Program",
+			"loyalty_program_name": "Test Multiple Loyalty",
+			"auto_opt_in": 1,
+			"from_date": today(),
+			"loyalty_program_type": "Multiple Tier Program",
+			"conversion_factor": 1,
+			"expiry_duration": 10,
+			"company": "_Test Company",
+			"cost_center": "Main - _TC",
+			"expense_account": "Loyalty - _TC",
+			"collection_rules": [
+				{
+					'tier_name': 'Silver',
+					'collection_factor': 1000,
+					'min_spent': 10000
+				},
+				{
+					'tier_name': 'Gold',
+					'collection_factor': 1000,
+					'min_spent': 19000
+				}
+			]
+		}).insert()
 
 	# create an item
-	item = frappe.get_doc({
-		"doctype": "Item",
-		"item_code": "Loyal Item",
-		"item_name": "Loyal Item",
-		"item_group": "All Item Groups",
-		"company": "_Test Company",
-		"is_stock_item": 1,
-		"opening_stock": 100,
-		"valuation_rate": 10000,
-	}).insert()
+	if not frappe.db.exists("Item", "Loyal Item"):
+		frappe.get_doc({
+			"doctype": "Item",
+			"item_code": "Loyal Item",
+			"item_name": "Loyal Item",
+			"item_group": "All Item Groups",
+			"company": "_Test Company",
+			"is_stock_item": 1,
+			"opening_stock": 100,
+			"valuation_rate": 10000,
+		}).insert()
 
 	# create item price
-	frappe.get_doc({
-		"doctype": "Item Price",
-		"price_list": "Standard Selling",
-		"item_code": item.item_code,
-		"price_list_rate": 10000
-	}).insert()
+	if not frappe.db.exists("Item Price", {"price_list": "Standard Selling", "item_code": "Loyal Item"}):
+		frappe.get_doc({
+			"doctype": "Item Price",
+			"price_list": "Standard Selling",
+			"item_code": "Loyal Item",
+			"price_list_rate": 10000
+		}).insert()
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_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_closing_entry/test_pos_closing_entry.py b/erpnext/accounts/doctype/pos_closing_entry/test_pos_closing_entry.py
index aa6a388..8de54d5 100644
--- a/erpnext/accounts/doctype/pos_closing_entry/test_pos_closing_entry.py
+++ b/erpnext/accounts/doctype/pos_closing_entry/test_pos_closing_entry.py
@@ -45,7 +45,7 @@
 		frappe.set_user("Administrator")
 		frappe.db.sql("delete from `tabPOS Profile`")
 
-def init_user_and_profile():
+def init_user_and_profile(**args):
 	user = 'test@example.com'
 	test_user = frappe.get_doc('User', user)
 
@@ -53,7 +53,7 @@
 	test_user.add_roles(*roles)
 	frappe.set_user(user)
 
-	pos_profile = make_pos_profile()
+	pos_profile = make_pos_profile(**args)
 	pos_profile.append('applicable_for_users', {
 		'default': 1,
 		'user': user
diff --git a/erpnext/accounts/doctype/pos_invoice/pos_invoice.py b/erpnext/accounts/doctype/pos_invoice/pos_invoice.py
index ba68df7..1669ca4 100644
--- a/erpnext/accounts/doctype/pos_invoice/pos_invoice.py
+++ b/erpnext/accounts/doctype/pos_invoice/pos_invoice.py
@@ -139,7 +139,8 @@
 			frappe.throw(_("At least one mode of payment is required for POS invoice."))
 
 	def validate_change_account(self):
-		if frappe.db.get_value("Account", self.account_for_change_amount, "company") != self.company:
+		if self.change_amount and self.account_for_change_amount and \
+			frappe.db.get_value("Account", self.account_for_change_amount, "company") != self.company:
 			frappe.throw(_("The selected change account {} doesn't belongs to Company {}.").format(self.account_for_change_amount, self.company))
 
 	def validate_change_amount(self):
diff --git a/erpnext/accounts/doctype/pos_invoice/test_pos_invoice.py b/erpnext/accounts/doctype/pos_invoice/test_pos_invoice.py
index e08af95..c179360 100644
--- a/erpnext/accounts/doctype/pos_invoice/test_pos_invoice.py
+++ b/erpnext/accounts/doctype/pos_invoice/test_pos_invoice.py
@@ -8,6 +8,7 @@
 from erpnext.accounts.doctype.pos_profile.test_pos_profile import make_pos_profile
 from erpnext.accounts.doctype.pos_invoice.pos_invoice import make_sales_return
 from erpnext.stock.doctype.stock_entry.stock_entry_utils import make_stock_entry
+from erpnext.stock.doctype.purchase_receipt.test_purchase_receipt import make_purchase_receipt
 
 class TestPOSInvoice(unittest.TestCase):
 	def test_timestamp_change(self):
@@ -222,29 +223,29 @@
 		from erpnext.stock.doctype.stock_entry.test_stock_entry import make_serialized_item
 		from erpnext.stock.doctype.serial_no.serial_no import get_serial_nos
 
-		se = make_serialized_item(company='_Test Company with perpetual inventory',
-			target_warehouse="Stores - TCP1", cost_center='Main - TCP1', expense_account='Cost of Goods Sold - TCP1')
+		se = make_serialized_item(company='_Test Company',
+			target_warehouse="Stores - _TC", cost_center='Main - _TC', expense_account='Cost of Goods Sold - _TC')
 
 		serial_nos = get_serial_nos(se.get("items")[0].serial_no)
 
-		pos = create_pos_invoice(company='_Test Company with perpetual inventory', debit_to='Debtors - TCP1',
-			account_for_change_amount='Cash - TCP1', warehouse='Stores - TCP1', income_account='Sales - TCP1',
-			expense_account='Cost of Goods Sold - TCP1', cost_center='Main - TCP1',
+		pos = create_pos_invoice(company='_Test Company', debit_to='Debtors - _TC',
+			account_for_change_amount='Cash - _TC', warehouse='Stores - _TC', income_account='Sales - _TC',
+			expense_account='Cost of Goods Sold - _TC', cost_center='Main - _TC',
 			item=se.get("items")[0].item_code, rate=1000, do_not_save=1)
 
 		pos.get("items")[0].serial_no = serial_nos[0]
-		pos.append("payments", {'mode_of_payment': 'Bank Draft', 'account': '_Test Bank - TCP1', 'amount': 1000})
+		pos.append("payments", {'mode_of_payment': 'Bank Draft', 'account': '_Test Bank - _TC', 'amount': 1000})
 
 		pos.insert()
 		pos.submit()
 
-		pos2 = create_pos_invoice(company='_Test Company with perpetual inventory', debit_to='Debtors - TCP1',
-			account_for_change_amount='Cash - TCP1', warehouse='Stores - TCP1', income_account='Sales - TCP1',
-			expense_account='Cost of Goods Sold - TCP1', cost_center='Main - TCP1',
+		pos2 = create_pos_invoice(company='_Test Company', debit_to='Debtors - _TC',
+			account_for_change_amount='Cash - _TC', warehouse='Stores - _TC', income_account='Sales - _TC',
+			expense_account='Cost of Goods Sold - _TC', cost_center='Main - _TC',
 			item=se.get("items")[0].item_code, rate=1000, do_not_save=1)
 
 		pos2.get("items")[0].serial_no = serial_nos[0]
-		pos2.append("payments", {'mode_of_payment': 'Bank Draft', 'account': '_Test Bank - TCP1', 'amount': 1000})
+		pos2.append("payments", {'mode_of_payment': 'Bank Draft', 'account': '_Test Bank - _TC', 'amount': 1000})
 
 		self.assertRaises(frappe.ValidationError, pos2.insert)
 
@@ -286,7 +287,7 @@
 
 		after_redeem_lp_details = get_loyalty_program_details_with_points(inv.customer, company=inv.company, loyalty_program=inv.loyalty_program)
 		self.assertEqual(after_redeem_lp_details.loyalty_points, 9)
-	
+
 	def test_merging_into_sales_invoice_with_discount(self):
 		from erpnext.accounts.doctype.pos_closing_entry.test_pos_closing_entry import init_user_and_profile
 		from erpnext.accounts.doctype.pos_invoice_merge_log.pos_invoice_merge_log import merge_pos_invoices
@@ -295,7 +296,7 @@
 		test_user, pos_profile = init_user_and_profile()
 		pos_inv = create_pos_invoice(rate=300, additional_discount_percentage=10, do_not_submit=1)
 		pos_inv.append('payments', {
-			'mode_of_payment': 'Cash', 'account': 'Cash - _TC', 'amount': 300
+			'mode_of_payment': 'Cash', 'account': 'Cash - _TC', 'amount': 270
 		})
 		pos_inv.submit()
 
@@ -309,9 +310,9 @@
 
 		pos_inv.load_from_db()
 		rounded_total = frappe.db.get_value("Sales Invoice", pos_inv.consolidated_invoice, "rounded_total")
-		self.assertEqual(rounded_total, 3500)
+		self.assertEqual(rounded_total, 3470)
 		frappe.set_user("Administrator")
-	
+
 	def test_merging_into_sales_invoice_with_discount_and_inclusive_tax(self):
 		from erpnext.accounts.doctype.pos_closing_entry.test_pos_closing_entry import init_user_and_profile
 		from erpnext.accounts.doctype.pos_invoice_merge_log.pos_invoice_merge_log import merge_pos_invoices
@@ -361,7 +362,7 @@
 		if not frappe.db.get_single_value("Selling Settings", "validate_selling_price"):
 			frappe.db.set_value("Selling Settings", "Selling Settings", "validate_selling_price", 1)
 
-		make_stock_entry(item_code="_Test Item", target="_Test Warehouse - _TC", qty=1, basic_rate=300)
+		make_purchase_receipt(item_code="_Test Item", warehouse="_Test Warehouse - _TC", qty=1, rate=300)
 		frappe.db.sql("delete from `tabPOS Invoice`")
 		test_user, pos_profile = init_user_and_profile()
 		pos_inv = create_pos_invoice(rate=300, do_not_submit=1)
@@ -413,8 +414,6 @@
 	pos_inv.is_pos = 1
 	pos_inv.pos_profile = args.pos_profile or pos_profile.name
 
-	pos_inv.set_missing_values()
-
 	if args.posting_date:
 		pos_inv.set_posting_time = 1
 	pos_inv.posting_date = args.posting_date or frappe.utils.nowdate()
@@ -428,6 +427,8 @@
 	pos_inv.conversion_rate = args.conversion_rate or 1
 	pos_inv.account_for_change_amount = args.account_for_change_amount or "Cash - _TC"
 
+	pos_inv.set_missing_values()
+
 	pos_inv.append("items", {
 		"item_code": args.item or args.item_code or "_Test Item",
 		"warehouse": args.warehouse or "_Test Warehouse - _TC",
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/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/buying/doctype/purchase_order/test_purchase_order.py b/erpnext/buying/doctype/purchase_order/test_purchase_order.py
index 158799c..7c8ae6c 100644
--- a/erpnext/buying/doctype/purchase_order/test_purchase_order.py
+++ b/erpnext/buying/doctype/purchase_order/test_purchase_order.py
@@ -651,12 +651,12 @@
 		make_subcontracted_item(item_code)
 
 		po = create_purchase_order(item_code=item_code, qty=1,
-			is_subcontracted="Yes", supplier_warehouse="_Test Warehouse 1 - _TC")
+			is_subcontracted="Yes", supplier_warehouse="_Test Warehouse 1 - _TC", include_exploded_items=1)
 
 		name = frappe.db.get_value('BOM', {'item': item_code}, 'name')
 		bom = frappe.get_doc('BOM', name)
 
-		exploded_items = sorted([d.item_code for d in bom.exploded_items])
+		exploded_items = sorted([d.item_code for d in bom.exploded_items if not d.get('sourced_by_supplier')])
 		supplied_items = sorted([d.rm_item_code for d in po.supplied_items])
 		self.assertEquals(exploded_items, supplied_items)
 
@@ -664,7 +664,7 @@
 			is_subcontracted="Yes", supplier_warehouse="_Test Warehouse 1 - _TC", include_exploded_items=0)
 
 		supplied_items1 = sorted([d.rm_item_code for d in po1.supplied_items])
-		bom_items = sorted([d.item_code for d in bom.items])
+		bom_items = sorted([d.item_code for d in bom.items if not d.get('sourced_by_supplier')])
 
 		self.assertEquals(supplied_items1, bom_items)
 
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..0ab39b6 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"))
 		}
@@ -194,6 +192,66 @@
 			});
 		});
 		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['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.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();
 	}
 })
 
@@ -276,7 +334,7 @@
 					})
 				}, __("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",
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..5f01f6e 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",
@@ -19,7 +19,12 @@
   "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",
@@ -126,8 +131,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 +144,8 @@
    "print_hide": 1
   },
   {
+   "fetch_from": "email_template.response",
+   "fetch_if_empty": 1,
    "fieldname": "message_for_supplier",
    "fieldtype": "Text Editor",
    "in_list_view": 1,
@@ -230,12 +239,45 @@
    "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",
  "is_submittable": 1,
  "links": [],
- "modified": "2020-06-25 14:37:21.140194",
+ "modified": "2020-10-01 14:54:50.888729",
  "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..7784a7b 100644
--- a/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py
+++ b/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py
@@ -51,7 +51,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,17 +62,31 @@
 	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.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):
@@ -87,18 +101,19 @@
 
 	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 +130,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 +148,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)
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 019cefc..ea38129 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
@@ -9,7 +9,7 @@
 from frappe.utils import nowdate
 from erpnext.stock.doctype.item.test_item import make_item
 from erpnext.templates.pages.rfq import check_supplier_has_docname_access
-from erpnext.buying.doctype.request_for_quotation.request_for_quotation import make_supplier_quotation
+from erpnext.buying.doctype.request_for_quotation.request_for_quotation import make_supplier_quotation_from_rfq
 from erpnext.buying.doctype.request_for_quotation.request_for_quotation import create_supplier_quotation
 from erpnext.crm.doctype.opportunity.test_opportunity import make_opportunity
 from erpnext.crm.doctype.opportunity.opportunity import make_request_for_quotation as make_rfq
@@ -22,7 +22,7 @@
 		self.assertEqual(rfq.get('suppliers')[1].quote_status, 'Pending')
 
 		# Submit the first supplier quotation
-		sq = make_supplier_quotation(rfq.name, rfq.get('suppliers')[0].supplier)
+		sq = make_supplier_quotation_from_rfq(rfq.name, for_supplier=rfq.get('suppliers')[0].supplier)
 		sq.submit()
 
 		# No Quote first supplier quotation
@@ -37,10 +37,10 @@
 	def test_make_supplier_quotation(self):
 		rfq = make_request_for_quotation()
 
-		sq = make_supplier_quotation(rfq.name, rfq.get('suppliers')[0].supplier)
+		sq = make_supplier_quotation_from_rfq(rfq.name, for_supplier=rfq.get('suppliers')[0].supplier)
 		sq.submit()
 
-		sq1 = make_supplier_quotation(rfq.name, rfq.get('suppliers')[1].supplier)
+		sq1 = make_supplier_quotation_from_rfq(rfq.name, for_supplier=rfq.get('suppliers')[1].supplier)
 		sq1.submit()
 
 		self.assertEqual(sq.supplier, rfq.get('suppliers')[0].supplier)
@@ -62,7 +62,7 @@
 
 		rfq = make_request_for_quotation(supplier_data=supplier_wt_appos)
 
-		sq = make_supplier_quotation(rfq.name, supplier_wt_appos[0].get("supplier"))
+		sq = make_supplier_quotation_from_rfq(rfq.name, for_supplier=supplier_wt_appos[0].get("supplier"))
 		sq.submit()
 
 		frappe.form_dict = frappe.local("form_dict")
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..ce9316f 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,112 @@
 {
- "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",
+  "no_quote",
+  "quote_status",
+  "column_break_3",
+  "supplier_name",
+  "email_id",
+  "download_pdf"
+ ],
  "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,
+   "default": "1",
+   "fieldname": "send_email",
+   "fieldtype": "Check",
+   "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": 4,
+   "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": 3,
+   "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,
+   "default": "0",
+   "depends_on": "eval:doc.docstatus >= 1 && doc.quote_status != 'Received'",
+   "fieldname": "no_quote",
+   "fieldtype": "Check",
+   "label": "No Quote"
+  },
   {
-   "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
-  }, 
+   "allow_on_submit": 1,
+   "depends_on": "eval:doc.docstatus >= 1 && !doc.no_quote",
+   "fieldname": "quote_status",
+   "fieldtype": "Select",
+   "label": "Quote Status",
+   "options": "Pending\nReceived\nNo Quote",
+   "read_only": 1
+  },
   {
-   "allow_bulk_edit": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "fieldname": "column_break_3", 
-   "fieldtype": "Column Break", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_global_search": 0, 
-   "in_list_view": 0, 
-   "in_standard_filter": 0, 
-   "length": 0, 
-   "no_copy": 0, 
-   "permlevel": 0, 
-   "precision": "", 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 0, 
-   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "translatable": 0,
-   "unique": 0
-  }, 
+   "fieldname": "column_break_3",
+   "fieldtype": "Column Break"
+  },
   {
-   "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
-  }, 
+   "fieldname": "email_id",
+   "fieldtype": "Data",
+   "in_list_view": 1,
+   "label": "Email Id",
+   "no_copy": 1
+  },
   {
-   "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
+   "allow_on_submit": 1,
+   "fieldname": "download_pdf",
+   "fieldtype": "Button",
+   "label": "Download PDF"
   }
- ], 
- "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
+ ],
+ "istable": 1,
+ "links": [],
+ "modified": "2020-09-28 19:31:11.855588",
+ "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/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/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/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/demo/user/purchase.py b/erpnext/demo/user/purchase.py
index 86757df..b7aca79 100644
--- a/erpnext/demo/user/purchase.py
+++ b/erpnext/demo/user/purchase.py
@@ -11,7 +11,7 @@
 from erpnext.exceptions import InvalidCurrency
 from erpnext.stock.doctype.material_request.material_request import make_request_for_quotation
 from erpnext.buying.doctype.request_for_quotation.request_for_quotation import \
-			 make_supplier_quotation as make_quotation_from_rfq
+			 make_supplier_quotation_from_rfq
 
 def work():
 	frappe.set_user(frappe.db.get_global('demo_purchase_user'))
@@ -44,7 +44,7 @@
 				rfq = frappe.get_doc('Request for Quotation', rfq.name)
 
 				for supplier in rfq.suppliers:
-					supplier_quotation = make_quotation_from_rfq(rfq.name, supplier.supplier)
+					supplier_quotation = make_supplier_quotation_from_rfq(rfq.name, for_supplier=supplier.supplier)
 					supplier_quotation.save()
 					supplier_quotation.submit()
 
diff --git a/erpnext/education/doctype/program/test_program.py b/erpnext/education/doctype/program/test_program.py
index 3bcca3a..edfad0d 100644
--- a/erpnext/education/doctype/program/test_program.py
+++ b/erpnext/education/doctype/program/test_program.py
@@ -68,7 +68,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/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/test_bom.py b/erpnext/manufacturing/doctype/bom/test_bom.py
index eface4d..3239478 100644
--- a/erpnext/manufacturing/doctype/bom/test_bom.py
+++ b/erpnext/manufacturing/doctype/bom/test_bom.py
@@ -207,7 +207,6 @@
 		supplied_items = sorted([d.rm_item_code for d in po.supplied_items])
 		self.assertEquals(bom_items, supplied_items)
 
-
 def get_default_bom(item_code="_Test FG Item 2"):
 	return frappe.db.get_value("BOM", {"item": item_code, "is_active": 1, "is_default": 1})
 
diff --git a/erpnext/payroll/doctype/salary_slip/test_salary_slip.py b/erpnext/payroll/doctype/salary_slip/test_salary_slip.py
index 37cd89a..7fe4165 100644
--- a/erpnext/payroll/doctype/salary_slip/test_salary_slip.py
+++ b/erpnext/payroll/doctype/salary_slip/test_salary_slip.py
@@ -347,8 +347,7 @@
 
 		# create additional salary of 150000
 		frappe.db.sql("""delete from `tabSalary Slip` where employee=%s""", (employee))
-		data["additional-1"] = create_additional_salary(employee, payroll_period, 50000)
-		data["additional-2"] = create_additional_salary(employee, payroll_period, 100000)
+		data["additional-1"] = create_additional_salary(employee, payroll_period, 150000)
 		data["deducted_dates"] = create_salary_slips_for_payroll_period(employee,
 			salary_structure.name, payroll_period)
 
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/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/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.py b/erpnext/selling/doctype/sales_order/sales_order.py
index 62a5d4e..fe3fa82 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
@@ -993,15 +993,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/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/stock/doctype/item/item.py b/erpnext/stock/doctype/item/item.py
index bfdddbb..a094e6c 100644
--- a/erpnext/stock/doctype/item/item.py
+++ b/erpnext/stock/doctype/item/item.py
@@ -577,8 +577,9 @@
 						# if barcode is getting updated , the row name has to reset.
 						# Delete previous old row doc and re-enter row as if new to reset name in db.
 						item_barcode.set("__islocal", True)
+						item_barcode_entry_name = item_barcode.name
 						item_barcode.name = None
-						frappe.delete_doc("Item Barcode", item_barcode.name)
+						frappe.delete_doc("Item Barcode", item_barcode_entry_name)
 
 	def validate_warehouse_for_reorder(self):
 		'''Validate Reorder level table for duplicate and conditional mandatory'''
diff --git a/erpnext/stock/doctype/item/test_item.py b/erpnext/stock/doctype/item/test_item.py
index cbd5e33..109731a 100644
--- a/erpnext/stock/doctype/item/test_item.py
+++ b/erpnext/stock/doctype/item/test_item.py
@@ -471,7 +471,7 @@
 		item_doc = frappe.get_doc('Item', item_code)
 		new_barcode = item_doc.append('barcodes')
 		new_barcode.update(barcode_properties_list[0])
-		self.assertRaises(frappe.DuplicateEntryError, item_doc.save)
+		self.assertRaises(frappe.UniqueValidationError, item_doc.save)
 
 		# Add invalid barcode - should cause InvalidBarcode
 		item_doc = frappe.get_doc('Item', item_code)
diff --git a/erpnext/stock/doctype/purchase_receipt/test_purchase_receipt.py b/erpnext/stock/doctype/purchase_receipt/test_purchase_receipt.py
index 1e7153e..74a06d8 100644
--- a/erpnext/stock/doctype/purchase_receipt/test_purchase_receipt.py
+++ b/erpnext/stock/doctype/purchase_receipt/test_purchase_receipt.py
@@ -181,17 +181,14 @@
 
 		#stock raw materials in a warehouse before transfer
 		make_stock_entry(target="_Test Warehouse - _TC",
-			item_code="_Test Item Home Desktop 100", qty=1, basic_rate=100)
-		make_stock_entry(target="_Test Warehouse - _TC",
 			item_code = "Test Extra Item 1", qty=1, basic_rate=100)
 		make_stock_entry(target="_Test Warehouse - _TC",
-			item_code = "_Test Item", qty=1, basic_rate=100)
-
+			item_code = "_Test FG Item", qty=1, basic_rate=100)
 		rm_items = [
 			{
 				"item_code": item_code,
 				"rm_item_code": po.supplied_items[0].rm_item_code,
-				"item_name": "_Test Item",
+				"item_name": "_Test FG Item",
 				"qty": po.supplied_items[0].required_qty,
 				"warehouse": "_Test Warehouse - _TC",
 				"stock_uom": "Nos"
@@ -203,14 +200,6 @@
 				"qty": po.supplied_items[1].required_qty,
 				"warehouse": "_Test Warehouse - _TC",
 				"stock_uom": "Nos"
-			},
-			{
-				"item_code": item_code,
-				"rm_item_code": po.supplied_items[2].rm_item_code,
-				"item_name": "_Test Item Home Desktop 100",
-				"qty": po.supplied_items[2].required_qty,
-				"warehouse": "_Test Warehouse - _TC",
-				"stock_uom": "Nos"
 			}
 		]
 		rm_item_string = json.dumps(rm_items)
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/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..a604ca3 100644
--- a/erpnext/translations/af.csv
+++ b/erpnext/translations/af.csv
@@ -3130,7 +3130,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;",
@@ -3997,6 +3996,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,
@@ -4546,7 +4546,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,
@@ -6481,7 +6480,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,
@@ -9603,3 +9601,11 @@
 "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,
diff --git a/erpnext/translations/am.csv b/erpnext/translations/am.csv
index accc23f..e80f811 100644
--- a/erpnext/translations/am.csv
+++ b/erpnext/translations/am.csv
@@ -3130,7 +3130,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; መቀየር አለበት ሊሆን ይችላል, ዜሮ ነው",
@@ -3997,6 +3996,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,ንጥል ሪፖርት ያድርጉ ፡፡,
@@ -4546,7 +4546,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,የክፍያ ውሎችን በራስ-ሰር ያውጡ።,
@@ -6481,7 +6480,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,ግምገማ ግብ,
@@ -9603,3 +9601,11 @@
 "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,ልክ ያልሆነ ሁኔታ መግለጫ,
diff --git a/erpnext/translations/ar.csv b/erpnext/translations/ar.csv
index 01a135d..3d25d7c 100644
--- a/erpnext/translations/ar.csv
+++ b/erpnext/translations/ar.csv
@@ -3130,7 +3130,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'",
@@ -3830,7 +3829,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,تعهد ضمان القرض,
@@ -3997,6 +3996,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,بلغ عن شيء,
@@ -4546,7 +4546,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,جلب شروط الدفع تلقائيًا,
@@ -6481,7 +6480,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,الغاية من التقييم,
@@ -9603,3 +9601,11 @@
 "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,تعبير شرط غير صالح,
diff --git a/erpnext/translations/bg.csv b/erpnext/translations/bg.csv
index c02c565..874eb68 100644
--- a/erpnext/translations/bg.csv
+++ b/erpnext/translations/bg.csv
@@ -3130,7 +3130,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;",
@@ -3997,6 +3996,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,Елемент на отчета,
@@ -4546,7 +4546,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,Автоматично извличане на условията за плащане,
@@ -6481,7 +6480,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,
@@ -9603,3 +9601,11 @@
 "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,Невалиден израз на условие,
diff --git a/erpnext/translations/bn.csv b/erpnext/translations/bn.csv
index 349df65..c3f45e0 100644
--- a/erpnext/translations/bn.csv
+++ b/erpnext/translations/bn.csv
@@ -3130,7 +3130,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; পরিবর্তন করা উচিত হতে পারে",
@@ -3997,6 +3996,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,আইটেম প্রতিবেদন করুন,
@@ -4546,7 +4546,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,স্বয়ংক্রিয়ভাবে প্রদানের শর্তাদি আনুন,
@@ -6481,7 +6480,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,মূল্যায়ন গোল,
@@ -9603,3 +9601,11 @@
 "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,অবৈধ শর্তের অভিব্যক্তি,
diff --git a/erpnext/translations/bs.csv b/erpnext/translations/bs.csv
index 7fee0ab..63195d1 100644
--- a/erpnext/translations/bs.csv
+++ b/erpnext/translations/bs.csv
@@ -3130,7 +3130,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;",
@@ -3997,6 +3996,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,
@@ -4546,7 +4546,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,
@@ -6481,7 +6480,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,
@@ -9603,3 +9601,11 @@
 "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,
diff --git a/erpnext/translations/ca.csv b/erpnext/translations/ca.csv
index cc36c6f..310c66a 100644
--- a/erpnext/translations/ca.csv
+++ b/erpnext/translations/ca.csv
@@ -3130,7 +3130,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;",
@@ -3997,6 +3996,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,
@@ -4546,7 +4546,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,
@@ -6481,7 +6480,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,
@@ -9603,3 +9601,11 @@
 "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,
diff --git a/erpnext/translations/cs.csv b/erpnext/translations/cs.csv
index 5b149b0..a96783b 100644
--- a/erpnext/translations/cs.csv
+++ b/erpnext/translations/cs.csv
@@ -3130,7 +3130,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;",
@@ -3997,6 +3996,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,
@@ -4546,7 +4546,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,
@@ -6481,7 +6480,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,
@@ -9603,3 +9601,11 @@
 "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,
diff --git a/erpnext/translations/da.csv b/erpnext/translations/da.csv
index b077869..7824a94 100644
--- a/erpnext/translations/da.csv
+++ b/erpnext/translations/da.csv
@@ -3130,7 +3130,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;",
@@ -3997,6 +3996,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,
@@ -4546,7 +4546,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,
@@ -6481,7 +6480,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,
@@ -9603,3 +9601,11 @@
 "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,
diff --git a/erpnext/translations/de.csv b/erpnext/translations/de.csv
index 8196d6c..35ac0c9 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,
@@ -530,7 +530,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 +539,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,
@@ -986,7 +986,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 +1042,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 +1667,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 +1803,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,
@@ -2223,7 +2223,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 +2536,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,
@@ -3130,7 +3130,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",
@@ -3997,6 +3996,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,
@@ -4073,7 +4073,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 +4209,7 @@
 Barcode,Barcode,
 Bold,Fett gedruckt,
 Center,Zentrieren,
-Clear,klar,
+Clear,Löschen,
 Comment,Kommentar,
 Comments,Kommentare,
 DocType,DocType,
@@ -4546,7 +4546,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,
@@ -5048,7 +5047,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 +6480,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,
@@ -9603,3 +9601,11 @@
 "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,
diff --git a/erpnext/translations/el.csv b/erpnext/translations/el.csv
index ec5a1be..c5725e4 100644
--- a/erpnext/translations/el.csv
+++ b/erpnext/translations/el.csv
@@ -3130,7 +3130,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;",
@@ -3997,6 +3996,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,Στοιχείο αναφοράς,
@@ -4546,7 +4546,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,Αυτόματη εξαγωγή όρων πληρωμής,
@@ -6481,7 +6480,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,Στόχος αξιολόγησης,
@@ -9603,3 +9601,11 @@
 "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,Μη έγκυρη έκφραση συνθήκης,
diff --git a/erpnext/translations/es.csv b/erpnext/translations/es.csv
index 08b3900..40a59c6 100644
--- a/erpnext/translations/es.csv
+++ b/erpnext/translations/es.csv
@@ -3130,7 +3130,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;",
@@ -3997,6 +3996,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 +4033,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 ...,
@@ -4546,7 +4546,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,
@@ -6481,7 +6480,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,
@@ -9603,3 +9601,11 @@
 "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,
diff --git a/erpnext/translations/et.csv b/erpnext/translations/et.csv
index 1ae39b0..81bad9b 100644
--- a/erpnext/translations/et.csv
+++ b/erpnext/translations/et.csv
@@ -3130,7 +3130,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;",
@@ -3997,6 +3996,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,
@@ -4546,7 +4546,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,
@@ -6481,7 +6480,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,
@@ -9603,3 +9601,11 @@
 "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,
diff --git a/erpnext/translations/fa.csv b/erpnext/translations/fa.csv
index 7c05d34..0abfa9f 100644
--- a/erpnext/translations/fa.csv
+++ b/erpnext/translations/fa.csv
@@ -3130,7 +3130,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;اتهامات بر اساس توزیع را تغییر,
@@ -3997,6 +3996,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,گزارش مورد,
@@ -4546,7 +4546,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,شرایط پرداخت به صورت خودکار را اخذ کنید,
@@ -6481,7 +6480,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,ارزیابی هدف,
@@ -9603,3 +9601,11 @@
 "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,بیان شرط نامعتبر است,
diff --git a/erpnext/translations/fi.csv b/erpnext/translations/fi.csv
index 8912848..d89436c 100644
--- a/erpnext/translations/fi.csv
+++ b/erpnext/translations/fi.csv
@@ -3130,7 +3130,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;",
@@ -3997,6 +3996,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,
@@ -4546,7 +4546,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,
@@ -6481,7 +6480,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,
@@ -9603,3 +9601,11 @@
 "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,
diff --git a/erpnext/translations/fr.csv b/erpnext/translations/fr.csv
index dd72c2e..ead2b9e 100644
--- a/erpnext/translations/fr.csv
+++ b/erpnext/translations/fr.csv
@@ -3130,7 +3130,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’",
@@ -3997,6 +3996,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,
@@ -4546,7 +4546,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,
@@ -6481,7 +6480,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,
@@ -9603,3 +9601,11 @@
 "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,
diff --git a/erpnext/translations/gu.csv b/erpnext/translations/gu.csv
index 452935a..b016767 100644
--- a/erpnext/translations/gu.csv
+++ b/erpnext/translations/gu.csv
@@ -3130,7 +3130,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; બદલવા જોઈએ કરી શકે",
@@ -3997,6 +3996,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,રિપોર્ટ આઇટમ,
@@ -4546,7 +4546,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,આપમેળે ચુકવણીની શરતો મેળવો,
@@ -6481,7 +6480,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,મૂલ્યાંકન ગોલ,
@@ -9603,3 +9601,11 @@
 "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,અમાન્ય શરત અભિવ્યક્તિ,
diff --git a/erpnext/translations/he.csv b/erpnext/translations/he.csv
index a3d76d5..fc4637b 100644
--- a/erpnext/translations/he.csv
+++ b/erpnext/translations/he.csv
@@ -3130,7 +3130,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;",
@@ -3997,6 +3996,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,פריט דוח,
@@ -4546,7 +4546,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,אחזר אוטומטית תנאי תשלום,
@@ -6481,7 +6480,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,מטרת הערכה,
@@ -9603,3 +9601,11 @@
 "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,ביטוי מצב לא חוקי,
diff --git a/erpnext/translations/hi.csv b/erpnext/translations/hi.csv
index 3e7db82..7a96f87 100644
--- a/erpnext/translations/hi.csv
+++ b/erpnext/translations/hi.csv
@@ -3130,7 +3130,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; परिवर्तन होना चाहिए हो सकता है",
@@ -3997,6 +3996,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,वस्तु की सूचना,
@@ -4546,7 +4546,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,स्वचालित रूप से भुगतान शर्तें प्राप्त करें,
@@ -6481,7 +6480,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,मूल्यांकन लक्ष्य,
@@ -9603,3 +9601,11 @@
 "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,अमान्य स्थिति अभिव्यक्ति,
diff --git a/erpnext/translations/hr.csv b/erpnext/translations/hr.csv
index e23006d..c54de75 100644
--- a/erpnext/translations/hr.csv
+++ b/erpnext/translations/hr.csv
@@ -3130,7 +3130,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;",
@@ -3997,6 +3996,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,
@@ -4546,7 +4546,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,
@@ -6481,7 +6480,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,
@@ -9603,3 +9601,11 @@
 "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,
diff --git a/erpnext/translations/hu.csv b/erpnext/translations/hu.csv
index d4e2216..ff361b8 100644
--- a/erpnext/translations/hu.csv
+++ b/erpnext/translations/hu.csv
@@ -3130,7 +3130,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'",
@@ -3997,6 +3996,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,
@@ -4546,7 +4546,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,
@@ -6481,7 +6480,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,
@@ -9603,3 +9601,11 @@
 "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,
diff --git a/erpnext/translations/id.csv b/erpnext/translations/id.csv
index 00d167a..dae254b 100644
--- a/erpnext/translations/id.csv
+++ b/erpnext/translations/id.csv
@@ -3130,7 +3130,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;",
@@ -3997,6 +3996,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,
@@ -4546,7 +4546,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,
@@ -6481,7 +6480,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,
@@ -9603,3 +9601,11 @@
 "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,
diff --git a/erpnext/translations/is.csv b/erpnext/translations/is.csv
index b7984c9..fb10982 100644
--- a/erpnext/translations/is.csv
+++ b/erpnext/translations/is.csv
@@ -3130,7 +3130,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;",
@@ -3997,6 +3996,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,
@@ -4546,7 +4546,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,
@@ -6481,7 +6480,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,
@@ -9603,3 +9601,11 @@
 "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,
diff --git a/erpnext/translations/it.csv b/erpnext/translations/it.csv
index 97bf2f1..d903b85 100644
--- a/erpnext/translations/it.csv
+++ b/erpnext/translations/it.csv
@@ -3130,7 +3130,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;",
@@ -3997,6 +3996,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,
@@ -4546,7 +4546,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,
@@ -5706,7 +5705,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 +6480,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,
@@ -9603,3 +9601,11 @@
 "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,
diff --git a/erpnext/translations/ja.csv b/erpnext/translations/ja.csv
index b2e6b75..fd19882 100644
--- a/erpnext/translations/ja.csv
+++ b/erpnext/translations/ja.csv
@@ -3130,7 +3130,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}のすべての項目がゼロになっています。「支払案分基準」を変更する必要があるかもしれません,
@@ -3997,6 +3996,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,レポートアイテム,
@@ -4546,7 +4546,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,支払い条件を自動的に取得する,
@@ -6481,7 +6480,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,査定目標,
@@ -9603,3 +9601,11 @@
 "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,無効な条件式,
diff --git a/erpnext/translations/km.csv b/erpnext/translations/km.csv
index d08acb3..56b9c4b 100644
--- a/erpnext/translations/km.csv
+++ b/erpnext/translations/km.csv
@@ -3130,7 +3130,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;ចែកបទចោទប្រកាន់ដោយផ្អែកលើ",
@@ -3997,6 +3996,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,រាយការណ៍អំពីធាតុ។,
@@ -4546,7 +4546,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,ប្រមូលយកលក្ខខណ្ឌទូទាត់ដោយស្វ័យប្រវត្តិ។,
@@ -6481,7 +6480,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,គោលដៅវាយតម្លៃ,
@@ -9603,3 +9601,11 @@
 "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,ការបង្ហាញលក្ខខណ្ឌមិនត្រឹមត្រូវ,
diff --git a/erpnext/translations/kn.csv b/erpnext/translations/kn.csv
index 7dfbb5c..f4ea679 100644
--- a/erpnext/translations/kn.csv
+++ b/erpnext/translations/kn.csv
@@ -3130,7 +3130,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;ಬದಲಿಸಬೇಕಾಗುತ್ತದೆ ಇರಬಹುದು",
@@ -3997,6 +3996,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,ಐಟಂ ವರದಿ ಮಾಡಿ,
@@ -4546,7 +4546,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,ಪಾವತಿ ನಿಯಮಗಳನ್ನು ಸ್ವಯಂಚಾಲಿತವಾಗಿ ಪಡೆದುಕೊಳ್ಳಿ,
@@ -6481,7 +6480,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,ಅಪ್ರೇಸಲ್ ಗೋಲ್,
@@ -9603,3 +9601,11 @@
 "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,ಅಮಾನ್ಯ ಸ್ಥಿತಿ ಅಭಿವ್ಯಕ್ತಿ,
diff --git a/erpnext/translations/ko.csv b/erpnext/translations/ko.csv
index cf25b92..54e3053 100644
--- a/erpnext/translations/ko.csv
+++ b/erpnext/translations/ko.csv
@@ -3130,7 +3130,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;변경해야 할 수있다, 제로",
@@ -3997,6 +3996,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,보고서 항목,
@@ -4546,7 +4546,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,지불 조건 자동 가져 오기,
@@ -6481,7 +6480,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,평가목표,
@@ -9603,3 +9601,11 @@
 "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,잘못된 조건식,
diff --git a/erpnext/translations/ku.csv b/erpnext/translations/ku.csv
index 56be7a1..c33080e 100644
--- a/erpnext/translations/ku.csv
+++ b/erpnext/translations/ku.csv
@@ -3130,7 +3130,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",
@@ -3997,6 +3996,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ê,
@@ -4546,7 +4546,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,
@@ -6481,7 +6480,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,
@@ -9603,3 +9601,11 @@
 "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,
diff --git a/erpnext/translations/lo.csv b/erpnext/translations/lo.csv
index a72a7cd..a9c6acd 100644
--- a/erpnext/translations/lo.csv
+++ b/erpnext/translations/lo.csv
@@ -3130,7 +3130,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;,
@@ -3997,6 +3996,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,ລາຍງານລາຍການ,
@@ -4546,7 +4546,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,ດຶງຂໍ້ມູນເງື່ອນໄຂການຈ່າຍເງິນໂດຍອັດຕະໂນມັດ,
@@ -6481,7 +6480,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,ການປະເມີນຜົນເປົ້າຫມາຍ,
@@ -9603,3 +9601,11 @@
 "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,ການສະແດງອອກເງື່ອນໄຂທີ່ບໍ່ຖືກຕ້ອງ,
diff --git a/erpnext/translations/lt.csv b/erpnext/translations/lt.csv
index cdcfe31..dbd3cfc 100644
--- a/erpnext/translations/lt.csv
+++ b/erpnext/translations/lt.csv
@@ -3130,7 +3130,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;",
@@ -3997,6 +3996,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ę,
@@ -4546,7 +4546,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,
@@ -6481,7 +6480,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,
@@ -9603,3 +9601,11 @@
 "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,
diff --git a/erpnext/translations/lv.csv b/erpnext/translations/lv.csv
index 7f5f87d..008203d 100644
--- a/erpnext/translations/lv.csv
+++ b/erpnext/translations/lv.csv
@@ -3130,7 +3130,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;",
@@ -3997,6 +3996,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,
@@ -4546,7 +4546,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,
@@ -6481,7 +6480,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,
@@ -9603,3 +9601,11 @@
 "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,
diff --git a/erpnext/translations/mk.csv b/erpnext/translations/mk.csv
index 99ef866..45ea856 100644
--- a/erpnext/translations/mk.csv
+++ b/erpnext/translations/mk.csv
@@ -3130,7 +3130,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;",
@@ -3997,6 +3996,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,Известување ставка,
@@ -4546,7 +4546,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,Автоматски дополнете услови за плаќање,
@@ -6481,7 +6480,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,Процена Цел,
@@ -9603,3 +9601,11 @@
 "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,Неважечки израз на состојба,
diff --git a/erpnext/translations/ml.csv b/erpnext/translations/ml.csv
index dd300d1..dcc6fd4 100644
--- a/erpnext/translations/ml.csv
+++ b/erpnext/translations/ml.csv
@@ -3130,7 +3130,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; മാറേണ്ടത് വരാം",
@@ -3997,6 +3996,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,ഇനം റിപ്പോർട്ടുചെയ്യുക,
@@ -4546,7 +4546,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,പേയ്‌മെന്റ് നിബന്ധനകൾ യാന്ത്രികമായി നേടുക,
@@ -6481,7 +6480,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,മൂല്യനിർണയം ഗോൾ,
@@ -9603,3 +9601,11 @@
 "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,കണ്ടീഷൻ എക്‌സ്‌പ്രഷൻ അസാധുവാണ്,
diff --git a/erpnext/translations/mr.csv b/erpnext/translations/mr.csv
index 6310181..29f597e 100644
--- a/erpnext/translations/mr.csv
+++ b/erpnext/translations/mr.csv
@@ -3130,7 +3130,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; बदलू पाहिजे",
@@ -3997,6 +3996,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,आयटम नोंदवा,
@@ -4546,7 +4546,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,देय अटी स्वयंचलितपणे मिळवा,
@@ -6481,7 +6480,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,मूल्यांकन लक्ष्य,
@@ -9603,3 +9601,11 @@
 "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,अवैध स्थिती अभिव्यक्ती,
diff --git a/erpnext/translations/ms.csv b/erpnext/translations/ms.csv
index 4b25177..59359b4 100644
--- a/erpnext/translations/ms.csv
+++ b/erpnext/translations/ms.csv
@@ -3130,7 +3130,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;",
@@ -3997,6 +3996,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,
@@ -4546,7 +4546,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,
@@ -6481,7 +6480,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,
@@ -9603,3 +9601,11 @@
 "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,
diff --git a/erpnext/translations/my.csv b/erpnext/translations/my.csv
index 33f94b2..1dcaa87 100644
--- a/erpnext/translations/my.csv
+++ b/erpnext/translations/my.csv
@@ -3130,7 +3130,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; ကိုပြောင်းလဲသင့်ပါတယ်ဖြစ်နိုင်သည်",
@@ -3997,6 +3996,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,
@@ -4546,7 +4546,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,ငွေပေးချေမှုရမည့်စည်းမျဉ်းစည်းကမ်းများအလိုအလြောကျခေါ်ယူ,
@@ -6481,7 +6480,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,စိစစ်ရေးဂိုး,
@@ -9603,3 +9601,11 @@
 "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,မမှန်ကန်သောအခြေအနေစကားရပ်,
diff --git a/erpnext/translations/nl.csv b/erpnext/translations/nl.csv
index cd885ce..afbb20b 100644
--- a/erpnext/translations/nl.csv
+++ b/erpnext/translations/nl.csv
@@ -3130,7 +3130,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;",
@@ -3997,6 +3996,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,
@@ -4546,7 +4546,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,
@@ -6481,7 +6480,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,
@@ -9603,3 +9601,11 @@
 "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,
diff --git a/erpnext/translations/no.csv b/erpnext/translations/no.csv
index 4ef4d43..36acb34 100644
--- a/erpnext/translations/no.csv
+++ b/erpnext/translations/no.csv
@@ -3130,7 +3130,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;",
@@ -3997,6 +3996,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,
@@ -4546,7 +4546,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,
@@ -6481,7 +6480,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,
@@ -9603,3 +9601,11 @@
 "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,
diff --git a/erpnext/translations/pl.csv b/erpnext/translations/pl.csv
index 2a9060d..df54b09 100644
--- a/erpnext/translations/pl.csv
+++ b/erpnext/translations/pl.csv
@@ -3130,7 +3130,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”",
@@ -3997,6 +3996,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,
@@ -4546,7 +4546,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,
@@ -6481,7 +6480,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,
@@ -9603,3 +9601,11 @@
 "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,
diff --git a/erpnext/translations/ps.csv b/erpnext/translations/ps.csv
index cd9fca7..011eef8 100644
--- a/erpnext/translations/ps.csv
+++ b/erpnext/translations/ps.csv
@@ -3130,7 +3130,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;,
@@ -3997,6 +3996,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,توکي راپور کړئ,
@@ -4546,7 +4546,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,د تادیې شرایط په اوتومات ډول راوړل,
@@ -6481,7 +6480,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,د ارزونې موخه,
@@ -9603,3 +9601,11 @@
 "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,د غلط حالت څرګندونه,
diff --git a/erpnext/translations/pt.csv b/erpnext/translations/pt.csv
index 9e78091..e1dd9f0 100644
--- a/erpnext/translations/pt.csv
+++ b/erpnext/translations/pt.csv
@@ -3130,7 +3130,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;",
@@ -3997,6 +3996,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,
@@ -4546,7 +4546,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,
@@ -6481,7 +6480,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,
@@ -9603,3 +9601,11 @@
 "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,
diff --git a/erpnext/translations/pt_br.csv b/erpnext/translations/pt_br.csv
index 3054ec2..ae6c30a 100644
--- a/erpnext/translations/pt_br.csv
+++ b/erpnext/translations/pt_br.csv
@@ -1365,7 +1365,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 +2132,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,
diff --git a/erpnext/translations/ro.csv b/erpnext/translations/ro.csv
index 21045a1..5ec3091 100644
--- a/erpnext/translations/ro.csv
+++ b/erpnext/translations/ro.csv
@@ -3130,7 +3130,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“",
@@ -3997,6 +3996,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,
@@ -4546,7 +4546,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ă,
@@ -6481,7 +6480,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ă,
@@ -9603,3 +9601,11 @@
 "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ă,
diff --git a/erpnext/translations/ru.csv b/erpnext/translations/ru.csv
index f007ec4..1efb1d4 100644
--- a/erpnext/translations/ru.csv
+++ b/erpnext/translations/ru.csv
@@ -3130,7 +3130,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} для всех элементов равно нулю, может быть, вы должны изменить «Распределить плату на основе»",
@@ -3997,6 +3996,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,Элемент отчета,
@@ -4546,7 +4546,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,Автоматически получать условия оплаты,
@@ -6481,7 +6480,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,Оценка Гол,
@@ -9603,3 +9601,11 @@
 "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,Недействительное выражение условия,
diff --git a/erpnext/translations/rw.csv b/erpnext/translations/rw.csv
index 1c54390..fdfcabc 100644
--- a/erpnext/translations/rw.csv
+++ b/erpnext/translations/rw.csv
@@ -3130,7 +3130,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;",
@@ -3997,6 +3996,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,
@@ -4546,7 +4546,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,
@@ -6481,7 +6480,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,
@@ -9603,3 +9601,11 @@
 "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,
diff --git a/erpnext/translations/si.csv b/erpnext/translations/si.csv
index 2fc5b32..fc1608d 100644
--- a/erpnext/translations/si.csv
+++ b/erpnext/translations/si.csv
@@ -3130,7 +3130,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; වෙනස් කළ යුතු ය විය හැකිය,
@@ -3997,6 +3996,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,අයිතමය වාර්තා කරන්න,
@@ -4546,7 +4546,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,ගෙවීම් නියමයන් ස්වයංක්‍රීයව ලබා ගන්න,
@@ -6481,7 +6480,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,ඇගයීෙම් අරමුණ,
@@ -9603,3 +9601,11 @@
 "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,අවලංගු තත්ව ප්‍රකාශනය,
diff --git a/erpnext/translations/sk.csv b/erpnext/translations/sk.csv
index d299a75..6046f4e 100644
--- a/erpnext/translations/sk.csv
+++ b/erpnext/translations/sk.csv
@@ -3130,7 +3130,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;",
@@ -3997,6 +3996,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,
@@ -4546,7 +4546,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,
@@ -6481,7 +6480,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,
@@ -9603,3 +9601,11 @@
 "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,
diff --git a/erpnext/translations/sl.csv b/erpnext/translations/sl.csv
index ab99eb5..ba53597 100644
--- a/erpnext/translations/sl.csv
+++ b/erpnext/translations/sl.csv
@@ -3130,7 +3130,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;",
@@ -3997,6 +3996,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,
@@ -4546,7 +4546,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,
@@ -6481,7 +6480,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,
@@ -9603,3 +9601,11 @@
 "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,
diff --git a/erpnext/translations/sq.csv b/erpnext/translations/sq.csv
index cc61bcb..0b0a35d 100644
--- a/erpnext/translations/sq.csv
+++ b/erpnext/translations/sq.csv
@@ -3130,7 +3130,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;",
@@ -3997,6 +3996,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,
@@ -4546,7 +4546,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,
@@ -6481,7 +6480,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,
@@ -9603,3 +9601,11 @@
 "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,
diff --git a/erpnext/translations/sr.csv b/erpnext/translations/sr.csv
index dad0e7e..a30f9d7 100644
--- a/erpnext/translations/sr.csv
+++ b/erpnext/translations/sr.csv
@@ -3130,7 +3130,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;",
@@ -3997,6 +3996,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,Извештај,
@@ -4546,7 +4546,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,Аутоматски преузми услове плаћања,
@@ -6481,7 +6480,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,Процена Гол,
@@ -9603,3 +9601,11 @@
 "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,Неважећи израз услова,
diff --git a/erpnext/translations/sv.csv b/erpnext/translations/sv.csv
index 17822ee..866def3 100644
--- a/erpnext/translations/sv.csv
+++ b/erpnext/translations/sv.csv
@@ -3130,7 +3130,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;,
@@ -3997,6 +3996,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,
@@ -4546,7 +4546,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,
@@ -6481,7 +6480,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,
@@ -9603,3 +9601,11 @@
 "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,
diff --git a/erpnext/translations/sw.csv b/erpnext/translations/sw.csv
index f019777..910ef35 100644
--- a/erpnext/translations/sw.csv
+++ b/erpnext/translations/sw.csv
@@ -3130,7 +3130,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;",
@@ -3997,6 +3996,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,
@@ -4546,7 +4546,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,
@@ -6481,7 +6480,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,
@@ -9603,3 +9601,11 @@
 "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,
diff --git a/erpnext/translations/ta.csv b/erpnext/translations/ta.csv
index f289156..ca7ddfe 100644
--- a/erpnext/translations/ta.csv
+++ b/erpnext/translations/ta.csv
@@ -3130,7 +3130,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; மாற்ற வேண்டும் இருக்கலாம்",
@@ -3997,6 +3996,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,உருப்படியைப் புகாரளி,
@@ -4546,7 +4546,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,கட்டண விதிமுறைகளை தானாகவே பெறுங்கள்,
@@ -6481,7 +6480,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,மதிப்பீட்டு இலக்கு,
@@ -9603,3 +9601,11 @@
 "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,தவறான நிலை வெளிப்பாடு,
diff --git a/erpnext/translations/te.csv b/erpnext/translations/te.csv
index ed3c2ff..94752a5 100644
--- a/erpnext/translations/te.csv
+++ b/erpnext/translations/te.csv
@@ -3130,7 +3130,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; మార్చాలి ఉండవచ్చు",
@@ -3997,6 +3996,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,అంశాన్ని నివేదించండి,
@@ -4546,7 +4546,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,చెల్లింపు నిబంధనలను స్వయంచాలకంగా పొందండి,
@@ -6481,7 +6480,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,అప్రైసల్ గోల్,
@@ -9603,3 +9601,11 @@
 "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,పరిస్థితి వ్యక్తీకరణ చెల్లదు,
diff --git a/erpnext/translations/th.csv b/erpnext/translations/th.csv
index 26aadc3..7975e89 100644
--- a/erpnext/translations/th.csv
+++ b/erpnext/translations/th.csv
@@ -3130,7 +3130,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;,
@@ -3997,6 +3996,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,รายการรายงาน,
@@ -4546,7 +4546,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,ดึงข้อมูลเงื่อนไขการชำระเงินอัตโนมัติ,
@@ -6481,7 +6480,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,เป้าหมายการประเมิน,
@@ -9603,3 +9601,11 @@
 "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,นิพจน์เงื่อนไขไม่ถูกต้อง,
diff --git a/erpnext/translations/tr.csv b/erpnext/translations/tr.csv
index 0329482..a42cc58 100644
--- a/erpnext/translations/tr.csv
+++ b/erpnext/translations/tr.csv
@@ -3130,7 +3130,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,
@@ -3997,6 +3996,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,
@@ -4546,7 +4546,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,
@@ -6481,7 +6480,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,
@@ -9603,3 +9601,11 @@
 "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,
diff --git a/erpnext/translations/uk.csv b/erpnext/translations/uk.csv
index 5d14ddf..46feef2 100644
--- a/erpnext/translations/uk.csv
+++ b/erpnext/translations/uk.csv
@@ -3130,7 +3130,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} для всіх елементів дорівнює нулю, може бути, ви повинні змінити «Розподілити плату на основі»",
@@ -3997,6 +3996,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,Елемент звіту,
@@ -4546,7 +4546,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,Автоматично отримати умови оплати,
@@ -6481,7 +6480,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,Оцінка Мета,
@@ -9603,3 +9601,11 @@
 "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,Недійсний вираз умови,
diff --git a/erpnext/translations/ur.csv b/erpnext/translations/ur.csv
index c81f3a4..c5152b4 100644
--- a/erpnext/translations/ur.csv
+++ b/erpnext/translations/ur.csv
@@ -3130,7 +3130,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;,
@@ -3997,6 +3996,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,آئٹم کی اطلاع دیں۔,
@@ -4546,7 +4546,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,ادائیگی کی شرائط خود بخود بازیافت کریں۔,
@@ -6481,7 +6480,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,تشخیص گول,
@@ -9603,3 +9601,11 @@
 "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,غلط شرط اظہار,
diff --git a/erpnext/translations/uz.csv b/erpnext/translations/uz.csv
index affbcfe..9fd2f1c 100644
--- a/erpnext/translations/uz.csv
+++ b/erpnext/translations/uz.csv
@@ -3130,7 +3130,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;",
@@ -3997,6 +3996,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,
@@ -4546,7 +4546,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,
@@ -6481,7 +6480,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,
@@ -9603,3 +9601,11 @@
 "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,
diff --git a/erpnext/translations/vi.csv b/erpnext/translations/vi.csv
index eefd59b..905bf95 100644
--- a/erpnext/translations/vi.csv
+++ b/erpnext/translations/vi.csv
@@ -3130,7 +3130,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 '",
@@ -3997,6 +3996,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,
@@ -4546,7 +4546,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,
@@ -6481,7 +6480,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,
@@ -9603,3 +9601,11 @@
 "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ệ,
diff --git a/erpnext/translations/zh.csv b/erpnext/translations/zh.csv
index 4f455ee..6bc1d34 100644
--- a/erpnext/translations/zh.csv
+++ b/erpnext/translations/zh.csv
@@ -3130,7 +3130,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}为零，可能你应该改变“基于分布式费用”,
@@ -3997,6 +3996,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,报告项目,
@@ -4546,7 +4546,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,自动获取付款条款,
@@ -6481,7 +6480,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,绩效评估指标,
@@ -9603,3 +9601,11 @@
 "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,条件表达式无效,
diff --git a/erpnext/translations/zh_tw.csv b/erpnext/translations/zh_tw.csv
index e2e9ed9..63492d7 100644
--- a/erpnext/translations/zh_tw.csv
+++ b/erpnext/translations/zh_tw.csv
@@ -2938,7 +2938,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}所有項目為零，可能是你應該“基於分佈式費用”改變,
@@ -3748,6 +3747,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,報告項目,
@@ -4257,7 +4257,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,自動獲取付款條款,
@@ -6032,7 +6031,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,考核目標,
@@ -8922,3 +8920,11 @@
 "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,條件表達式無效,