Merge pull request #23443 from marination/rfq-email
feat: Supplier Email Preview in RFQ
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/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/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/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/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/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/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/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 "Versprei koste gebaseer op '",
@@ -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 '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! = 'Alle gebiede'",
+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 '{0}' 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} ሁሉም ንጥሎች እናንተ 'ላይ የተመሠረተ ክፍያዎች ያሰራጩ' መቀየር አለበት ሊሆን ይችላል, ዜሮ ነው",
@@ -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'",ቀላል የፓይዘን መግለጫ ፣ ምሳሌ: ክልል! = 'ሁሉም ግዛቶች',
+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'",تعبير بايثون بسيط ، مثال: إقليم! = "كل الأقاليم",
+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/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},Общото разпределение на листа е задължително за тип "Отпуск" {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 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, Пример: территория! = 'Всички територии'",
+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} সব আইটেম জন্য শূন্য, আপনি 'উপর ভিত্তি করে চার্জ বিতরণ' পরিবর্তন করা উচিত হতে পারে",
@@ -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'","সাধারণ পাইথন এক্সপ্রেশন, উদাহরণ: অঞ্চল! = 'সমস্ত অঞ্চল'",
+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}' {0} 'সক্ষম করুন",
+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 'Rasporedite Optužbe na osnovu'",
@@ -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! = 'Sve teritorije'",
+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 '{0}' 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'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'{0} per a tots els elements és zero, pot ser que vostè ha de canviar a "Distribuir els càrrecs basats en '",
@@ -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'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'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'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'accés a la sol·licitud de pressupost des del portal està desactivat. Per permetre l'accés, activeu-lo a Configuració del portal.",
Supplier Quotation {0} Created,S'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! = "Tots els territoris"",
+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'empresa matriu {1}.,
+"To overrule this, enable '{0}' in company {1}","Per anul·lar això, activeu "{0}" a l'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 "Rozdělte poplatků založený na"",
@@ -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! = 'Všechna území'",
+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 "Fordel afgifter baseret på '",
@@ -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! = 'Alle territorier'",
+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 '{0}' 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 "Verteilen Gebühren auf der Grundlage" ä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! = 'Alle Territorien'",
+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 '{0}' 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} για όλα τα στοιχεία είναι μηδέν, μπορεί να πρέπει να αλλάξει »Μοιράστε τελών με βάση το '",
@@ -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! = 'Όλες οι περιοχές'",
+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/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 "Distribuir los cargos basados en '",
@@ -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! = 'Todos los territorios'",
+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 "{0}" 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 "Hajuta põhinevad maksud"",
@@ -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! = 'Kõik territooriumid'",
+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} برای همه موارد صفر است، ممکن است شما باید 'اتهامات بر اساس توزیع را تغییر,
@@ -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! = 'All Territories',
+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/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 "välit perustuvat maksujen '",
@@ -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! = 'Kaikki alueet'",
+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'accès à la demande de devis du portail est désactivé. Pour autoriser l'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'annulation de la commande,
+"Simple Python Expression, Example: territory != 'All Territories'","Expression Python simple, exemple: territoire! = 'Tous les territoires'",
+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'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'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} બધી વસ્તુઓ માટે શૂન્ય છે, તો તમે 'પર આધારિત ચાર્જિસ વિતરિત' બદલવા જોઈએ કરી શકે",
@@ -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'","સરળ પાયથોન અભિવ્યક્તિ, ઉદાહરણ: પ્રદેશ! = 'બધા પ્રદેશો'",
+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} માં '{0}' સક્ષમ કરો.",
+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},סה"כ שעות: {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 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'","ביטוי פייתון פשוט, דוגמה: טריטוריה! = 'כל השטחים'",
+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/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} सभी मदों के लिए शून्य है, तो आप 'के आधार पर शुल्क वितरित' परिवर्तन होना चाहिए हो सकता है",
@@ -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'","सरल अजगर अभिव्यक्ति, उदाहरण: क्षेत्र! = 'सभी क्षेत्र'",
+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/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 'Podijeliti optužbi na temelju'",
@@ -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! = 'Svi teritoriji'",
+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 "{0}" 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! = 'Minden terület'",
+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 'Distribusikan Biaya Berdasarkan'",
@@ -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! = 'Semua Wilayah'",
+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 '{0}' 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 'Úthluta Gjöld Byggt á'",
@@ -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! = 'All Territories'",
+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 '{0}' í 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'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'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 'distribuire oneri corrispondenti'",
@@ -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'ordine,
Book Asset Depreciation Entry Automatically,Apprendere automaticamente l'ammortamento dell'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'accesso alla richiesta di preventivo dal portale è disabilitato. Per consentire l'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'annullamento dell'ordine,
+"Simple Python Expression, Example: territory != 'All Territories'","Espressione Python semplice, esempio: territorio! = 'Tutti i territori'",
+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'account {0} esiste nella società madre {1}.,
+"To overrule this, enable '{0}' in company {1}","Per annullare questa impostazione, abilita "{0}" nell'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！= 'すべてのテリトリー',
+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,無効な条件式,